applied patch 1372197, with some minor mods and cleanup

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

diff --git a/wxPython/wx/py/PyShell.py b/wxPython/wx/py/PyShell.py
index 954ebed4c3358d34915bc3ede4b8f7a5d73de992..c800dc4d9c3e7cc2dc021b2055a999c609da90ad 100644 (file)
--- a/wxPython/wx/py/PyShell.py
+++ b/wxPython/wx/py/PyShell.py
@@ -18,10 +18,9 @@ class App(wx.App):
 
     def OnInit(self):
         import wx
 
     def OnInit(self):
         import wx

+        from wx import py

         wx.InitAllImageHandlers()
         wx.InitAllImageHandlers()

-        locals = __main__.__dict__
-        from shell import ShellFrame
-        self.frame = ShellFrame(locals=locals)
+        self.frame = py.shell.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)