Changed default namespace of Shell to __main__.__dict__, instead of an

empty dictionary.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/py/CHANGES.txt b/wxPython/wx/py/CHANGES.txt
index 27a65f22fdd4b30266cb874cb5aa9787f1a7780f..303ecc67877f617cdaf75b838c9f7777068ce120 100644 (file)
--- a/wxPython/wx/py/CHANGES.txt
+++ b/wxPython/wx/py/CHANGES.txt
@@ -11,6 +11,9 @@ Fixed Calltip tab refresh problem on Windows.
 
 shell.autoCompleteAutoHide added with default of True.
 
 
 shell.autoCompleteAutoHide added with default of True.
 

+Changed default namespace of Shell to __main__.__dict__, instead of an
+empty dictionary.
+

 
 0.9.3 (9/25/2003 to 1/24/2004)
 ------------------------------
 
 0.9.3 (9/25/2003 to 1/24/2004)
 ------------------------------

diff --git a/wxPython/wx/py/PyCrust.py b/wxPython/wx/py/PyCrust.py
index 4bd56370507b147ba538c59acfded7466829db99..ce961a8d077e8034294a9536266efdc70100ccfa 100644 (file)
--- a/wxPython/wx/py/PyCrust.py
+++ b/wxPython/wx/py/PyCrust.py
@@ -20,9 +20,8 @@ class App(wx.App):
     def OnInit(self):
         import wx
         wx.InitAllImageHandlers()
     def OnInit(self):
         import wx
         wx.InitAllImageHandlers()

-        locals = __main__.__dict__

         from crust import CrustFrame
         from crust import CrustFrame

-        self.frame = CrustFrame(locals=locals)
+        self.frame = CrustFrame()

         self.frame.SetSize((800, 600))
         self.frame.Show()
         self.SetTopWindow(self.frame)
         self.frame.SetSize((800, 600))
         self.frame.Show()
         self.SetTopWindow(self.frame)

diff --git a/wxPython/wx/py/PyShell.py b/wxPython/wx/py/PyShell.py
index 954ebed4c3358d34915bc3ede4b8f7a5d73de992..54cef8a71ea79c971a13a63850d98f0a04d80e1f 100644 (file)
--- a/wxPython/wx/py/PyShell.py
+++ b/wxPython/wx/py/PyShell.py
@@ -19,9 +19,8 @@ class App(wx.App):
     def OnInit(self):
         import wx
         wx.InitAllImageHandlers()
     def OnInit(self):
         import wx
         wx.InitAllImageHandlers()

-        locals = __main__.__dict__

         from shell import ShellFrame
         from shell import ShellFrame

-        self.frame = ShellFrame(locals=locals)
+        self.frame = ShellFrame()

         self.frame.SetSize((750, 525))
         self.frame.Show()
         self.SetTopWindow(self.frame)
         self.frame.SetSize((750, 525))
         self.frame.Show()
         self.SetTopWindow(self.frame)

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index 841a0e47e67fcf72b338a72cf63e6e581879aaa5..2232fd59b041682790d685ef3ea2df4a054106b1 100644 (file)
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -179,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