Applied patch [ 1281902 ] fix for wxJoystick under Linux

[wxWidgets.git] / wxPython / wx / py / interpreter.py

diff --git a/wxPython/wx/py/interpreter.py b/wxPython/wx/py/interpreter.py
index 426b0b966f0446bfa508db7f54f4d4c5b1964fce..112344ad3f6015915ba18fa00090f77f54aac286 100644 (file)
--- a/wxPython/wx/py/interpreter.py
+++ b/wxPython/wx/py/interpreter.py
@@ -9,13 +9,7 @@ import sys
 from code import InteractiveInterpreter
 import dispatcher
 import introspect
 from code import InteractiveInterpreter
 import dispatcher
 import introspect

-
-try:
-    True
-except NameError:
-    True = 1==1
-    False = 1==0
-
+import wx

 
 class Interpreter(InteractiveInterpreter):
     """Interpreter based on code.InteractiveInterpreter."""
 
 class Interpreter(InteractiveInterpreter):
     """Interpreter based on code.InteractiveInterpreter."""


@@ -59,7 +53,14 @@ class Interpreter(InteractiveInterpreter):
         command we keep appending the pieces to the last list in
         commandBuffer until we have a complete command. If not, we
         delete that last list."""
         command we keep appending the pieces to the last list in
         commandBuffer until we have a complete command. If not, we
         delete that last list."""

-        command = str(command)  # In case the command is unicode.
+
+        # In case the command is unicode try encoding it
+        if type(command) == unicode:
+            try:
+                command = command.encode(wx.GetDefaultPyEncoding())
+            except UnicodeEncodeError:
+                pass # otherwise leave it alone
+                

         if not self.more:
             try: del self.commandBuffer[-1]
             except IndexError: pass
         if not self.more:
             try: del self.commandBuffer[-1]
             except IndexError: pass