Eliminate relative imports and make them more py2exe friendly.

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

diff --git a/wxPython/wx/py/PyAlaCarte.py b/wxPython/wx/py/PyAlaCarte.py
index c665e4f4b608f2b80d27044409c5355c84bad0c6..561224489c8026db7e2d6f028457b25201b30454 100644 (file)
--- a/wxPython/wx/py/PyAlaCarte.py
+++ b/wxPython/wx/py/PyAlaCarte.py
@@ -5,12 +5,11 @@ __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
 import wx
 __revision__ = "$Revision$"[11:-2]
 
 import wx

+from wx import py

 
 import os
 import sys
 
 
 import os
 import sys
 

-import editor
-

 class App(wx.App):
     """PyAlaCarte standalone application."""
 
 class App(wx.App):
     """PyAlaCarte standalone application."""
 


@@ -20,7 +19,7 @@ class App(wx.App):
 
     def OnInit(self):
         wx.InitAllImageHandlers()
 
     def OnInit(self):
         wx.InitAllImageHandlers()

-        self.frame = editor.EditorFrame(filename=self.filename)
+        self.frame = py.editor.EditorFrame(filename=self.filename)

         self.frame.Show()
         self.SetTopWindow(self.frame)
         return True
         self.frame.Show()
         self.SetTopWindow(self.frame)
         return True

diff --git a/wxPython/wx/py/PyAlaMode.py b/wxPython/wx/py/PyAlaMode.py
index 06d1583657669f9891162436d3c2170ab154daf1..8330cc3c3ad40c41a07852de46730f74f4c188e9 100644 (file)
--- a/wxPython/wx/py/PyAlaMode.py
+++ b/wxPython/wx/py/PyAlaMode.py
@@ -5,12 +5,11 @@ __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
 import wx
 __revision__ = "$Revision$"[11:-2]
 
 import wx

+from wx import py

 
 import os
 import sys
 
 
 import os
 import sys
 

-import editor
-

 class App(wx.App):
     """PyAlaMode standalone application."""
 
 class App(wx.App):
     """PyAlaMode standalone application."""
 


@@ -20,7 +19,7 @@ class App(wx.App):
 
     def OnInit(self):
         wx.InitAllImageHandlers()
 
     def OnInit(self):
         wx.InitAllImageHandlers()

-        self.frame = editor.EditorNotebookFrame(filename=self.filename)
+        self.frame = py.editor.EditorNotebookFrame(filename=self.filename)

         self.frame.Show()
         self.SetTopWindow(self.frame)
         return True
         self.frame.Show()
         self.SetTopWindow(self.frame)
         return True

diff --git a/wxPython/wx/py/PyAlaModeTest.py b/wxPython/wx/py/PyAlaModeTest.py
index 3ae9cb600adff6467de8b9dd813a9356975db125..d1c02e0907c1b36016f7314fd75c29af9d8ac06d 100755 (executable)
--- a/wxPython/wx/py/PyAlaModeTest.py
+++ b/wxPython/wx/py/PyAlaModeTest.py
@@ -5,12 +5,11 @@ __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
 import wx
 __revision__ = "$Revision$"[11:-2]
 
 import wx

+from wx import py

 
 import os
 import sys
 
 
 import os
 import sys
 

-import editor
-

 class App(wx.App):
     """PyAlaModeTest standalone application."""
 
 class App(wx.App):
     """PyAlaModeTest standalone application."""
 


@@ -20,7 +19,7 @@ class App(wx.App):
 
     def OnInit(self):
         wx.InitAllImageHandlers()
 
     def OnInit(self):
         wx.InitAllImageHandlers()

-        self.frame = editor.EditorShellNotebookFrame(filename=self.filename)
+        self.frame = py.editor.EditorShellNotebookFrame(filename=self.filename)

         self.frame.Show()
         self.SetTopWindow(self.frame)
         return True
         self.frame.Show()
         self.SetTopWindow(self.frame)
         return True

diff --git a/wxPython/wx/py/PyCrust.py b/wxPython/wx/py/PyCrust.py
index ce961a8d077e8034294a9536266efdc70100ccfa..b9a222763e59623667f5cef2b1755c7c8758e7d9 100644 (file)
--- a/wxPython/wx/py/PyCrust.py
+++ b/wxPython/wx/py/PyCrust.py
@@ -13,15 +13,14 @@ __revision__ = "$Revision$"[11:-2]
 
 import wx
 
 
 import wx
 

-

 class App(wx.App):
     """PyCrust standalone application."""
 
     def OnInit(self):
         import wx
 class App(wx.App):
     """PyCrust standalone application."""
 
     def OnInit(self):
         import wx

+        from wx import py

         wx.InitAllImageHandlers()
         wx.InitAllImageHandlers()

-        from crust import CrustFrame
-        self.frame = CrustFrame()
+        self.frame = py.crust.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 54cef8a71ea79c971a13a63850d98f0a04d80e1f..c800dc4d9c3e7cc2dc021b2055a999c609da90ad 100644 (file)
--- a/wxPython/wx/py/PyShell.py
+++ b/wxPython/wx/py/PyShell.py
@@ -18,9 +18,9 @@ class App(wx.App):
 
     def OnInit(self):
         import wx
 
     def OnInit(self):
         import wx

+        from wx import py

         wx.InitAllImageHandlers()
         wx.InitAllImageHandlers()

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

diff --git a/wxPython/wx/py/PyWrap.py b/wxPython/wx/py/PyWrap.py
index 333ad8d064e1827897e22ed5a955a918c1e70e7e..99a91f1833b0f6594931528c1989f75ef976a325 100644 (file)
--- a/wxPython/wx/py/PyWrap.py
+++ b/wxPython/wx/py/PyWrap.py
@@ -5,14 +5,15 @@ __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 

+import wx
+from wx import py
+

 import os
 import sys
 import os
 import sys

-import wx
-from wx.py.crust import CrustFrame

 
 def wrap(app):
     wx.InitAllImageHandlers()
 
 def wrap(app):
     wx.InitAllImageHandlers()

-    frame = CrustFrame()
+    frame = py.crust.CrustFrame()

     frame.SetSize((750, 525))
     frame.Show(True)
     frame.shell.interp.locals['app'] = app
     frame.SetSize((750, 525))
     frame.Show(True)
     frame.shell.interp.locals['app'] = app