don't add \n, it's supposed to be part of the input

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

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index 5c343c6b77d76ff2673c9a67dae8c670916ba378..2232fd59b041682790d685ef3ea2df4a054106b1 100644 (file)
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -25,12 +25,6 @@ from pseudo import PseudoFileOut
 from pseudo import PseudoFileErr
 from version import VERSION
 
 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,
 sys.ps3 = '<-- '  # Input prompt.
 
 NAVKEYS = (wx.WXK_END, wx.WXK_LEFT, wx.WXK_RIGHT,


@@ -151,6 +145,7 @@ Ctrl+=            Default font size.
             'ask',
             'autoCallTip',
             'autoComplete',
             'ask',
             'autoCallTip',
             'autoComplete',

+            'autoCompleteAutoHide',

             'autoCompleteCaseInsensitive',
             'autoCompleteIncludeDouble',
             'autoCompleteIncludeMagic',
             'autoCompleteCaseInsensitive',
             'autoCompleteIncludeDouble',
             'autoCompleteIncludeMagic',


@@ -184,7 +179,8 @@ class Shell(editwindow.EditWindow):
         editwindow.EditWindow.__init__(self, parent, id, pos, size, style)
         self.wrap()
         if locals is None:
         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
         # Grab these so they can be restored by self.redirect* methods.
         self.stdin = sys.stdin
         self.stdout = sys.stdout


@@ -822,6 +818,8 @@ Platform: %s""" % \
 
     def autoCompleteShow(self, command):
         """Display auto-completion popup list."""
 
     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,
         list = self.interp.getAutoCompleteList(command,
                     includeMagic=self.autoCompleteIncludeMagic,
                     includeSingle=self.autoCompleteIncludeSingle,