little tweaks

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

diff --git a/wxPython/wx/py/interpreter.py b/wxPython/wx/py/interpreter.py
index fe95d5e80b839065427809185b89df584bef4a99..4eef617272e4478464d8b9153569c1153d9ec371 100644 (file)
--- a/wxPython/wx/py/interpreter.py
+++ b/wxPython/wx/py/interpreter.py
@@ -9,7 +9,7 @@ import sys
 from code import InteractiveInterpreter
 import dispatcher
 import introspect
-
+import wx
 
 class Interpreter(InteractiveInterpreter):
     """Interpreter based on code.InteractiveInterpreter."""
@@ -42,7 +42,8 @@ class Interpreter(InteractiveInterpreter):
         self.more = 0
         # List of lists to support recursive push().
         self.commandBuffer = []
-        self.startupScript = os.environ.get('PYTHONSTARTUP')
+        self.startupScript = None
+        
 
     def push(self, command):
         """Send command to the interpreter to be executed.
@@ -53,7 +54,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 = 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