@@ -40,18 +40,6 @@ def readlines(self):
40
40
def read (self ):
41
41
return None
42
42
43
- def asUnicode (s ):
44
- try :
45
- return unicode (s )
46
- except :
47
- return str (s )
48
-
49
- def ensureUtf (s ):
50
- if type (s ) == unicode :
51
- return s .encode ('utf8' , 'ignore' )
52
- else :
53
- return str (s )
54
-
55
43
def findLoc (body , line , total ):
56
44
for i in range (len (body )):
57
45
if body [i ].lineno == line :
@@ -190,11 +178,11 @@ def handleEval(data):
190
178
loc = form [0 ]
191
179
isEval = False
192
180
try :
193
- code = compile (ensureUtf ( code ), ensureUtf (data [2 ]["name" ]), 'eval' )
181
+ code = compile (code , str (data [2 ]["name" ]), 'eval' )
194
182
isEval = True
195
183
except :
196
184
try :
197
- code = compile (ensureUtf ( code ), ensureUtf (data [2 ]["name" ]), 'exec' )
185
+ code = compile (code , str (data [2 ]["name" ]), 'exec' )
198
186
except :
199
187
e = traceback .format_exc ()
200
188
send (data [0 ], "editor.eval.python.exception" , {"ex" : cleanTrace (e ), "meta" : loc })
@@ -203,7 +191,7 @@ def handleEval(data):
203
191
try :
204
192
if isEval :
205
193
result = eval (code , module .__dict__ )
206
- send (data [0 ], "editor.eval.python.result" , {"meta" : loc , "result" : asUnicode (result )})
194
+ send (data [0 ], "editor.eval.python.result" , {"meta" : loc , "result" : str (result )})
207
195
else :
208
196
exec (code , module .__dict__ )
209
197
send (data [0 ], "editor.eval.python.success" , {"meta" : loc })
@@ -260,11 +248,11 @@ def ipyEval(data):
260
248
loc = form [0 ]
261
249
isEval = False
262
250
try :
263
- compile (ensureUtf ( code ), ensureUtf (data [2 ]["name" ]), 'eval' )
251
+ compile (code , str (data [2 ]["name" ]), 'eval' )
264
252
isEval = True
265
253
except :
266
254
try :
267
- compile (ensureUtf ( code ), ensureUtf (data [2 ]["name" ]), 'exec' )
255
+ compile (code , str (data [2 ]["name" ]), 'exec' )
268
256
except :
269
257
e = traceback .format_exc ()
270
258
send (data [0 ], "editor.eval.python.exception" , {"ex" : cleanTrace (e ), "meta" : loc })
0 commit comments