summaryrefslogtreecommitdiff
path: root/python/scriptingprovider.py
diff options
context:
space:
mode:
authorRusty Wagner <rusty@vector35.com>2018-08-28 17:19:32 -0400
committerRusty Wagner <rusty@vector35.com>2018-08-28 17:19:32 -0400
commit20e06506a3d96c7327ca5d729ab01e8c2a7cff3c (patch)
tree65880063ccbdcb45cc247a0138915d8560d2ec27 /python/scriptingprovider.py
parent5841af2db8e8dcf4e0da0c438ac040c5fa90038b (diff)
parent426bb3d8b47b93658bf969c429a8b98adae13c30 (diff)
Merge branch 'dev' into test_stack_adjust
Diffstat (limited to 'python/scriptingprovider.py')
-rw-r--r--python/scriptingprovider.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py
index 37642ed4..5b5d830e 100644
--- a/python/scriptingprovider.py
+++ b/python/scriptingprovider.py
@@ -612,7 +612,10 @@ class PythonScriptingInstance(ScriptingInstance):
return ScriptingProviderExecuteResult.SuccessfulScriptExecution
try:
- result = code.compile_command(text)
+ if isinstance(text, str):
+ result = code.compile_command(text)
+ else:
+ result = code.compile_command(text.decode("charmap"))
except:
result = False
@@ -661,4 +664,4 @@ def redirect_stdio():
sys.stdin = _PythonScriptingInstanceInput(sys.stdin)
sys.stdout = _PythonScriptingInstanceOutput(sys.stdout, False)
sys.stderr = _PythonScriptingInstanceOutput(sys.stderr, True)
- sys.excepthook = sys.__excepthook__ \ No newline at end of file
+ sys.excepthook = sys.__excepthook__