Check for errors after unicode conversions

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

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index a3ad8b7a72396197096c47078668f519bd043c20..2232fd59b041682790d685ef3ea2df4a054106b1 100644 (file)
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -8,9 +8,6 @@ __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-#from wxd.d_wx import wx
-#from wxd.d_stc import stc
-
 import wx
 from wx import stc
 
@@ -28,12 +25,6 @@ from pseudo import PseudoFileOut
 from pseudo import PseudoFileErr
 from version import VERSION
 
-try:
-    True
-except NameError:
-    True = 1==1
-    False = 1==0
-
 sys.ps3 = '<-- '  # Input prompt.
 
 NAVKEYS = (wx.WXK_END, wx.WXK_LEFT, wx.WXK_RIGHT,
@@ -154,6 +145,7 @@ Ctrl+=            Default font size.
             'ask',
             'autoCallTip',
             'autoComplete',
+            'autoCompleteAutoHide',
             'autoCompleteCaseInsensitive',
             'autoCompleteIncludeDouble',
             'autoCompleteIncludeMagic',
@@ -187,7 +179,8 @@ class Shell(editwindow.EditWindow):
         editwindow.EditWindow.__init__(self, parent, id, pos, size, style)
         self.wrap()
         if locals is None:
-            locals = {}
+            import __main__
+            locals = __main__.__dict__
         # Grab these so they can be restored by self.redirect* methods.
         self.stdin = sys.stdin
         self.stdout = sys.stdout
@@ -825,6 +818,8 @@ Platform: %s""" % \
 
     def autoCompleteShow(self, command):
         """Display auto-completion popup list."""
+        self.AutoCompSetAutoHide(self.autoCompleteAutoHide)
+        self.AutoCompSetIgnoreCase(self.autoCompleteCaseInsensitive)
         list = self.interp.getAutoCompleteList(command,
                     includeMagic=self.autoCompleteIncludeMagic,
                     includeSingle=self.autoCompleteIncludeSingle,