ensure things are encoded correctly when we pass them off to compile

Signed-off-by: Chris Granger <[email protected]>

Author: ibdknox

py-src/ltmain.py

@@ -46,6 +46,12 @@ def asUnicode(s):
   except:
     return str(s)
 
+def ensureUtf(s):
+  if type(s) == unicode:
+    return s.encode('utf8', 'ignore')
+  else:
+    return str(s)
+
 def findLoc(body, line, total):
   for i in range(len(body)):
     if body[i].lineno == line:
@@ -184,19 +190,19 @@ def handleEval(data):
       loc = form[0]
       isEval = False
       try:
-        code= compile(code, data[2]["name"], 'eval')
+        code= compile(ensureUtf(code), ensureUtf(data[2]["name"]), 'eval')
         isEval = True
       except:
         try:
-          code= compile(code, data[2]["name"], 'exec')
+          code= compile(ensureUtf(code), ensureUtf(data[2]["name"]), 'exec')
         except:
           e = traceback.format_exc()
           send(data[0], "editor.eval.python.exception", {"ex": cleanTrace(e), "meta": loc})
           continue
 
       try:
         if isEval:
-          result = eval(code, module.__dict__)
+          result = eval(ensureUtf(code), module.__dict__)
           send(data[0], "editor.eval.python.result", {"meta": loc, "result": asUnicode(result)})
         else:
           exec(code, module.__dict__)
@@ -254,11 +260,11 @@ def ipyEval(data):
       loc = form[0]
       isEval = False
       try:
-        compile(code, data[2]["name"], 'eval')
+        compile(ensureUtf(code), ensureUtf(data[2]["name"]), 'eval')
         isEval = True
       except:
         try:
-          compile(code, data[2]["name"], 'exec')
+          compile(ensureUtf(code), ensureUtf(data[2]["name"]), 'exec')
         except:
           e = traceback.format_exc()
           send(data[0], "editor.eval.python.exception", {"ex": cleanTrace(e), "meta": loc})