Regenerated the files for the wx renamer package

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

wxPython/wx/__init__.py

@@ -1,41 +1,74 @@
 """wx package
 
-Provides a way to drop the wx prefix from wxPython objects."""
+Provides a way to drop the wx prefix from wxPython objects by
+dynamically loading and renaming objects from the real wxPython
+package.  This is the first phase of a transition to a new style of
+using wxPython.  For example:
+
+    import wx
+    class MyFrame(wx.Frame):
+        ...
+
+instead of:
+
+    from wxPython.wx import *
+    class MyFrame(wxFrame):
+        ...
+
+or:
+
+    from wxPython import wx
+    class MyFrame(wx.wxFrame):
+        ...
+
+
+Internally, this package contains only one function, called _rename,
+and one dictionary, called _newnames.  These are used by wx itself and
+by its sub-modules whenever they are imported.  The _rename function
+changes the names in the real wxPython module being imported according
+to the rules that have been decided, e.g. most wx prefixes are
+removed, and the new names are made visible in the wx package or
+sub-packages.
+
+The _newnames dictionary holds the set of new names (from wx and ALL
+sub-modules), keyed by the original name. This serves two purposes,
+duplicate old names in different modules are eliminated, the survivor
+being the name in wx itself; and the dictionary is accessible to
+external scripts whose purpose is to change occurrences of the
+corresponding names in application programs that use wx.
+
+"""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
 from wxPython import wx
 
-import types
+_newnames = {}
 
-d_new = globals()
+def _rename(d_new, d_old, modulename=None):
-d_old = wx.__dict__
+    " copy the names from d_old to d_new according to the rules"
-
+    global _newnames
-for old, obj in d_old.items():
+    import types
-    if type(obj) is types.ModuleType or old.startswith('_'):
+    prefix = 'wx.'
-        # Skip modules and private names.
+    if modulename:
-        continue
+        prefix += modulename + '.'
-    new = old
+    for old, obj in d_old.items():
-    if old.startswith('EVT_'):
+        if type(obj) is types.ModuleType or old.startswith('_'):
-        # Leave name unmodified; add to the new wx namespace.
+            # Skip modules and private names.
-        d_new[new] = obj
+            continue
-    elif old.startswith('wxEVT_'):
+        if old.startswith('wx') and not old.startswith('wxEVT_'):
-        # Leave name unmodified; add to the new wx namespace.
+            # remove all wx prefixes except wxEVT_
-        d_new[new] = obj
-    else:
-        if old.startswith('wx'):
-            # Remove the 'wx' prefix.
             new = old[2:]
-        # Add to the new wx package namespace.
+        else:
-        d_new[new] = obj
+            # add everything else unchanged
+            new = old
+        if _newnames.has_key(old):
+            d_new[new] = obj
+            _newnames[old] = prefix + new      # add fully qualified new name to lookup using old name as key
 
-del d_new
+# rename the wx namespace itself
-del d_old
-del new
-del obj
-del old
-del types
 
+_rename(globals(), wx.__dict__)
 del wx
+

wxPython/wx/calendar.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython import calendar
-prefix.rename(d_new=globals(), d_old=calendar.__dict__)
+_rename(globals(), calendar.__dict__, modulename='calendar')
 del calendar
-
+del _rename
-del prefix
-del wx

wxPython/wx/dllwidget.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython import dllwidget
+_rename(globals(), dllwidget.__dict__, modulename='dllwidget')
+del dllwidget
+del _rename

wxPython/wx/gizmos.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython import gizmos
-prefix.rename(d_new=globals(), d_old=gizmos.__dict__)
+_rename(globals(), gizmos.__dict__, modulename='gizmos')
 del gizmos
-
+del _rename
-del prefix
-del wx

wxPython/wx/glcanvas.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython import glcanvas
-prefix.rename(d_new=globals(), d_old=glcanvas.__dict__)
+_rename(globals(), glcanvas.__dict__, modulename='glcanvas')
 del glcanvas
-
+del _rename
-del prefix
-del wx

wxPython/wx/grid.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython import grid
-prefix.rename(d_new=globals(), d_old=grid.__dict__)
+_rename(globals(), grid.__dict__, modulename='grid')
 del grid
-
+del _rename
-del prefix
-del wx

wxPython/wx/help.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython import help
-prefix.rename(d_new=globals(), d_old=help.__dict__)
+_rename(globals(), help.__dict__, modulename='help')
 del help
-
+del _rename
-del prefix
-del wx

wxPython/wx/html.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython import html
-prefix.rename(d_new=globals(), d_old=html.__dict__)
+_rename(globals(), html.__dict__, modulename='html')
 del html
-
+del _rename
-del prefix
-del wx

wxPython/wx/htmlhelp.py

@@ -1,15 +0,0 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
-
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
-__cvsid__ = "$Id$"
-__revision__ = "$Revision$"[11:-2]
-
-import wx
-from wx import prefix
-
-from wxPython import htmlhelp
-prefix.rename(d_new=globals(), d_old=htmlhelp.__dict__)
-del htmlhelp
-
-del prefix
-del wx

wxPython/wx/iewin.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython import iewin
-prefix.rename(d_new=globals(), d_old=iewin.__dict__)
+_rename(globals(), iewin.__dict__, modulename='iewin')
 del iewin
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/CDate.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import CDate
-
+_rename(globals(), CDate.__dict__, modulename='lib.CDate')
-from wxPython.lib import CDate as old
+del CDate
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/ClickableHtmlWindow.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import ClickableHtmlWindow
-prefix.rename(d_new=globals(), d_old=ClickableHtmlWindow.__dict__)
+_rename(globals(), ClickableHtmlWindow.__dict__, modulename='lib.ClickableHtmlWindow')
 del ClickableHtmlWindow
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/ErrorDialogs.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import ErrorDialogs
-prefix.rename(d_new=globals(), d_old=ErrorDialogs.__dict__)
+_rename(globals(), ErrorDialogs.__dict__, modulename='lib.ErrorDialogs')
 del ErrorDialogs
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/ErrorDialogs_wdr.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.lib import ErrorDialogs_wdr
+_rename(globals(), ErrorDialogs_wdr.__dict__, modulename='lib.ErrorDialogs_wdr')
+del ErrorDialogs_wdr
+del _rename

wxPython/wx/lib/PythonBitmaps.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import PythonBitmaps
-
+_rename(globals(), PythonBitmaps.__dict__, modulename='lib.PythonBitmaps')
-from wxPython.lib import PythonBitmaps as old
+del PythonBitmaps
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/__init__.py

@@ -1 +1 @@
-# Python package.
+# Python package

wxPython/wx/lib/activexwrapper.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import activexwrapper
-prefix.rename(d_new=globals(), d_old=activexwrapper.__dict__)
+_rename(globals(), activexwrapper.__dict__, modulename='lib.activexwrapper')
 del activexwrapper
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/analogclock.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import analogclock
-prefix.rename(d_new=globals(), d_old=analogclock.__dict__)
+_rename(globals(), analogclock.__dict__, modulename='lib.analogclock')
 del analogclock
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/anchors.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import anchors
-prefix.rename(d_new=globals(), d_old=anchors.__dict__)
+_rename(globals(), anchors.__dict__, modulename='lib.anchors')
 del anchors
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/buttons.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import buttons
-prefix.rename(d_new=globals(), d_old=buttons.__dict__)
+_rename(globals(), buttons.__dict__, modulename='lib.buttons')
 del buttons
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/calendar.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import calendar
-prefix.rename(d_new=globals(), d_old=calendar.__dict__)
+_rename(globals(), calendar.__dict__, modulename='lib.calendar')
 del calendar
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/colourchooser/__init__.py

@@ -1 +1 @@
-# Python package.
+# Python package

wxPython/wx/lib/colourchooser/canvas.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.colourchooser import canvas
-prefix.rename(d_new=globals(), d_old=canvas.__dict__)
+_rename(globals(), canvas.__dict__, modulename='lib.colourchooser.canvas')
 del canvas
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/colourchooser/intl.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.colourchooser import intl
-prefix.rename(d_new=globals(), d_old=intl.__dict__)
+_rename(globals(), intl.__dict__, modulename='lib.colourchooser.intl')
 del intl
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/colourchooser/pycolourbox.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.colourchooser import pycolourbox
-prefix.rename(d_new=globals(), d_old=pycolourbox.__dict__)
+_rename(globals(), pycolourbox.__dict__, modulename='lib.colourchooser.pycolourbox')
 del pycolourbox
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/colourchooser/pycolourchooser.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.colourchooser import pycolourchooser
-prefix.rename(d_new=globals(), d_old=pycolourchooser.__dict__)
+_rename(globals(), pycolourchooser.__dict__, modulename='lib.colourchooser.pycolourchooser')
 del pycolourchooser
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/colourchooser/pycolourslider.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.colourchooser import pycolourslider
-prefix.rename(d_new=globals(), d_old=pycolourslider.__dict__)
+_rename(globals(), pycolourslider.__dict__, modulename='lib.colourchooser.pycolourslider')
 del pycolourslider
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/colourchooser/pypalette.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.colourchooser import pypalette
-prefix.rename(d_new=globals(), d_old=pypalette.__dict__)
+_rename(globals(), pypalette.__dict__, modulename='lib.colourchooser.pypalette')
 del pypalette
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/colourdb.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import colourdb
-prefix.rename(d_new=globals(), d_old=colourdb.__dict__)
+_rename(globals(), colourdb.__dict__, modulename='lib.colourdb')
 del colourdb
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/colourselect.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import colourselect
-prefix.rename(d_new=globals(), d_old=colourselect.__dict__)
+_rename(globals(), colourselect.__dict__, modulename='lib.colourselect')
 del colourselect
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/dialogs.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import dialogs
-prefix.rename(d_new=globals(), d_old=dialogs.__dict__)
+_rename(globals(), dialogs.__dict__, modulename='lib.dialogs')
 del dialogs
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/editor/__init__.py

@@ -1 +1 @@
-# Python package.
+# Python package

wxPython/wx/lib/editor/editor.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.editor import editor
-prefix.rename(d_new=globals(), d_old=editor.__dict__)
+_rename(globals(), editor.__dict__, modulename='lib.editor.editor')
 del editor
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/editor/images.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.editor import images
-prefix.rename(d_new=globals(), d_old=images.__dict__)
+_rename(globals(), images.__dict__, modulename='lib.editor.images')
 del images
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/editor/selection.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.editor import selection
-prefix.rename(d_new=globals(), d_old=selection.__dict__)
+_rename(globals(), selection.__dict__, modulename='lib.editor.selection')
 del selection
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/evtmgr.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import evtmgr
-prefix.rename(d_new=globals(), d_old=evtmgr.__dict__)
+_rename(globals(), evtmgr.__dict__, modulename='lib.evtmgr')
 del evtmgr
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/fancytext.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import fancytext
-prefix.rename(d_new=globals(), d_old=fancytext.__dict__)
+_rename(globals(), fancytext.__dict__, modulename='lib.fancytext')
 del fancytext
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/filebrowsebutton.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import filebrowsebutton
-prefix.rename(d_new=globals(), d_old=filebrowsebutton.__dict__)
+_rename(globals(), filebrowsebutton.__dict__, modulename='lib.filebrowsebutton')
 del filebrowsebutton
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/floatbar.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import floatbar
-
+_rename(globals(), floatbar.__dict__, modulename='lib.floatbar')
-from wxPython.lib import floatbar as old
+del floatbar
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/gridmovers.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import gridmovers
-prefix.rename(d_new=globals(), d_old=gridmovers.__dict__)
+_rename(globals(), gridmovers.__dict__, modulename='lib.gridmovers')
 del gridmovers
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/grids.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import grids
-prefix.rename(d_new=globals(), d_old=grids.__dict__)
+_rename(globals(), grids.__dict__, modulename='lib.grids')
 del grids
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/imagebrowser.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import imagebrowser
-prefix.rename(d_new=globals(), d_old=imagebrowser.__dict__)
+_rename(globals(), imagebrowser.__dict__, modulename='lib.imagebrowser')
 del imagebrowser
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/imageutils.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import imageutils
-prefix.rename(d_new=globals(), d_old=imageutils.__dict__)
+_rename(globals(), imageutils.__dict__, modulename='lib.imageutils')
 del imageutils
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/infoframe.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import infoframe
-prefix.rename(d_new=globals(), d_old=infoframe.__dict__)
+_rename(globals(), infoframe.__dict__, modulename='lib.infoframe')
 del infoframe
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/intctrl.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import intctrl
-prefix.rename(d_new=globals(), d_old=intctrl.__dict__)
+_rename(globals(), intctrl.__dict__, modulename='lib.intctrl')
 del intctrl
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/layoutf.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import layoutf
-prefix.rename(d_new=globals(), d_old=layoutf.__dict__)
+_rename(globals(), layoutf.__dict__, modulename='lib.layoutf')
 del layoutf
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/maskededit.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import maskededit
-
+_rename(globals(), maskededit.__dict__, modulename='lib.maskededit')
-from wxPython.lib import maskededit as old
+del maskededit
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/mixins/__init__.py

@@ -1 +1 @@
-# Python package.
+# Python package

wxPython/wx/lib/mixins/grid.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.mixins import grid
-prefix.rename(d_new=globals(), d_old=grid.__dict__)
+_rename(globals(), grid.__dict__, modulename='lib.mixins.grid')
 del grid
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/mixins/imagelist.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.mixins import imagelist
-prefix.rename(d_new=globals(), d_old=imagelist.__dict__)
+_rename(globals(), imagelist.__dict__, modulename='lib.mixins.imagelist')
 del imagelist
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/mixins/listctrl.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.mixins import listctrl
-prefix.rename(d_new=globals(), d_old=listctrl.__dict__)
+_rename(globals(), listctrl.__dict__, modulename='lib.mixins.listctrl')
 del listctrl
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/mixins/rubberband.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib.mixins import rubberband
-prefix.rename(d_new=globals(), d_old=rubberband.__dict__)
+_rename(globals(), rubberband.__dict__, modulename='lib.mixins.rubberband')
 del rubberband
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/multisash.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import multisash
-prefix.rename(d_new=globals(), d_old=multisash.__dict__)
+_rename(globals(), multisash.__dict__, modulename='lib.multisash')
 del multisash
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/mvctree.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import mvctree
-
+_rename(globals(), mvctree.__dict__, modulename='lib.mvctree')
-from wxPython.lib import mvctree as old
+del mvctree
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/popupctl.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import popupctl
-prefix.rename(d_new=globals(), d_old=popupctl.__dict__)
+_rename(globals(), popupctl.__dict__, modulename='lib.popupctl')
 del popupctl
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/printout.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import printout
-prefix.rename(d_new=globals(), d_old=printout.__dict__)
+_rename(globals(), printout.__dict__, modulename='lib.printout')
 del printout
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/pubsub.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import pubsub
-
+_rename(globals(), pubsub.__dict__, modulename='lib.pubsub')
-from wxPython.lib import pubsub as old
+del pubsub
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/pyshell.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import pyshell
-
+_rename(globals(), pyshell.__dict__, modulename='lib.pyshell')
-from wxPython.lib import pyshell as old
+del pyshell
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/rcsizer.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import rcsizer
-prefix.rename(d_new=globals(), d_old=rcsizer.__dict__)
+_rename(globals(), rcsizer.__dict__, modulename='lib.rcsizer')
 del rcsizer
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/rightalign.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import rightalign
-prefix.rename(d_new=globals(), d_old=rightalign.__dict__)
+_rename(globals(), rightalign.__dict__, modulename='lib.rightalign')
 del rightalign
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/rpcMixin.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import rpcMixin
-
+_rename(globals(), rpcMixin.__dict__, modulename='lib.rpcMixin')
-from wxPython.lib import rpcMixin as old
+del rpcMixin
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/scrolledpanel.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import scrolledpanel
-
+_rename(globals(), scrolledpanel.__dict__, modulename='lib.scrolledpanel')
-from wxPython.lib import scrolledpanel as old
+del scrolledpanel
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/sheet.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import sheet
-prefix.rename(d_new=globals(), d_old=sheet.__dict__)
+_rename(globals(), sheet.__dict__, modulename='lib.sheet')
 del sheet
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/shell.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import shell
-
+_rename(globals(), shell.__dict__, modulename='lib.shell')
-from wxPython.lib import shell as old
+del shell
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/splashscreen.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import splashscreen
-
+_rename(globals(), splashscreen.__dict__, modulename='lib.splashscreen')
-from wxPython.lib import splashscreen as old
+del splashscreen
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/stattext.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import stattext
-prefix.rename(d_new=globals(), d_old=stattext.__dict__)
+_rename(globals(), stattext.__dict__, modulename='lib.stattext')
 del stattext
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/throbber.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import throbber
-prefix.rename(d_new=globals(), d_old=throbber.__dict__)
+_rename(globals(), throbber.__dict__, modulename='lib.throbber')
 del throbber
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/timectrl.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import timectrl
-prefix.rename(d_new=globals(), d_old=timectrl.__dict__)
+_rename(globals(), timectrl.__dict__, modulename='lib.timectrl')
 del timectrl
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/vtk.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
+from wxPython.lib import vtk
-
+_rename(globals(), vtk.__dict__, modulename='lib.vtk')
-from wxPython.lib import vtk as old
+del vtk
-prefix.rename(d_new=globals(), d_old=old.__dict__)
+del _rename
-del old
-
-del prefix
-del wx

wxPython/wx/lib/wxPlotCanvas.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import wxPlotCanvas
-prefix.rename(d_new=globals(), d_old=wxPlotCanvas.__dict__)
+_rename(globals(), wxPlotCanvas.__dict__, modulename='lib.wxPlotCanvas')
 del wxPlotCanvas
-
+del _rename
-del prefix
-del wx

wxPython/wx/lib/wxpTag.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython.lib import wxpTag
-prefix.rename(d_new=globals(), d_old=wxpTag.__dict__)
+_rename(globals(), wxpTag.__dict__, modulename='lib.wxpTag')
 del wxpTag
-
+del _rename
-del prefix
-del wx

wxPython/wx/ogl.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython import ogl
-prefix.rename(d_new=globals(), d_old=ogl.__dict__)
+_rename(globals(), ogl.__dict__, modulename='ogl')
 del ogl
-
+del _rename
-del prefix
-del wx

wxPython/wx/prefix.py

@@ -1,28 +0,0 @@
-"""Renaming utility.
-
-Provides a way to drop the wx prefix from wxPython objects."""
-
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
-__cvsid__ = "$Id$"
-__revision__ = "$Revision$"[11:-2]
-
-import types
-
-def rename(d_new, d_old):
-    for old, obj in d_old.items():
-        if type(obj) is types.ModuleType or old.startswith('_'):
-            # Skip modules and private names.
-            continue
-##         mod = d_old['__name__']
-##         if hasattr(obj, '__module__') and not obj.__module__.startswith(mod):
-##             # Skip objects imported from other modules, except those
-##             # related to the current module, such as stc_.
-##             continue
-        new = old
-        if old.startswith('EVT_') or old.startswith('wxEVT_'):
-            # Leave these names unmodified.
-            pass 
-        elif old.startswith('wx'):
-            new = old[2:]
-        if new:
-            d_new[new] = d_old[old]

wxPython/wx/py/PyAlaCarte.py

@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
+
-# renaming done.
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
-from wxPython.py.PyAlaCarte import *
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyAlaCarte
+_rename(globals(), PyAlaCarte.__dict__, modulename='py.PyAlaCarte')
+del PyAlaCarte
+del _rename

wxPython/wx/py/PyAlaMode.py

@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
+
-# renaming done.
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
-from wxPython.py.PyAlaMode import *
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyAlaMode
+_rename(globals(), PyAlaMode.__dict__, modulename='py.PyAlaMode')
+del PyAlaMode
+del _rename

wxPython/wx/py/PyCrust.py

@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
+
-# renaming done.
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
-from wxPython.py.PyCrust import *
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyCrust
+_rename(globals(), PyCrust.__dict__, modulename='py.PyCrust')
+del PyCrust
+del _rename

wxPython/wx/py/PyFilling.py

@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
+
-# renaming done.
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
-from wxPython.py.PyFilling import *
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyFilling
+_rename(globals(), PyFilling.__dict__, modulename='py.PyFilling')
+del PyFilling
+del _rename

wxPython/wx/py/PyShell.py

@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
+
-# renaming done.
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
-from wxPython.py.PyShell import *
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyShell
+_rename(globals(), PyShell.__dict__, modulename='py.PyShell')
+del PyShell
+del _rename

wxPython/wx/py/PyWrap.py

@@ -1,3 +1,11 @@
-# Py is really located in the old namespace, but it doesn't need any
+
-# renaming done.
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
-from wxPython.py.PyWrap import *
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import PyWrap
+_rename(globals(), PyWrap.__dict__, modulename='py.PyWrap')
+del PyWrap
+del _rename

wxPython/wx/py/__init__.py

@@ -1,3 +1 @@
-# Py is really located in the old namespace, but it doesn't need any
+# Python package
-# renaming done.
-from wxPython.py import *

wxPython/wx/py/buffer.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import buffer
+_rename(globals(), buffer.__dict__, modulename='py.buffer')
+del buffer
+del _rename

wxPython/wx/py/crust.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import crust
+_rename(globals(), crust.__dict__, modulename='py.crust')
+del crust
+del _rename

wxPython/wx/py/dispatcher.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import dispatcher
+_rename(globals(), dispatcher.__dict__, modulename='py.dispatcher')
+del dispatcher
+del _rename

wxPython/wx/py/document.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import document
+_rename(globals(), document.__dict__, modulename='py.document')
+del document
+del _rename

wxPython/wx/py/editor.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import editor
+_rename(globals(), editor.__dict__, modulename='py.editor')
+del editor
+del _rename

wxPython/wx/py/editwindow.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import editwindow
+_rename(globals(), editwindow.__dict__, modulename='py.editwindow')
+del editwindow
+del _rename

wxPython/wx/py/filling.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import filling
+_rename(globals(), filling.__dict__, modulename='py.filling')
+del filling
+del _rename

wxPython/wx/py/frame.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import frame
+_rename(globals(), frame.__dict__, modulename='py.frame')
+del frame
+del _rename

wxPython/wx/py/images.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import images
+_rename(globals(), images.__dict__, modulename='py.images')
+del images
+del _rename

wxPython/wx/py/interpreter.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import interpreter
+_rename(globals(), interpreter.__dict__, modulename='py.interpreter')
+del interpreter
+del _rename

wxPython/wx/py/introspect.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import introspect
+_rename(globals(), introspect.__dict__, modulename='py.introspect')
+del introspect
+del _rename

wxPython/wx/py/pseudo.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import pseudo
+_rename(globals(), pseudo.__dict__, modulename='py.pseudo')
+del pseudo
+del _rename

wxPython/wx/py/shell.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import shell
+_rename(globals(), shell.__dict__, modulename='py.shell')
+del shell
+del _rename

wxPython/wx/py/version.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.py import version
+_rename(globals(), version.__dict__, modulename='py.version')
+del version
+del _rename

wxPython/wx/stc.py

@@ -1,15 +1,11 @@
-"""Provides a way to drop the wx prefix from wxPython objects."""
 
-__author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
-import wx
+from wx import _rename
-from wx import prefix
-
 from wxPython import stc
-prefix.rename(d_new=globals(), d_old=stc.__dict__)
+_rename(globals(), stc.__dict__, modulename='stc')
 del stc
-
+del _rename
-del prefix
-del wx

wxPython/wx/tools/XRCed/__init__.py

@@ -0,0 +1 @@
+# Python package

wxPython/wx/tools/XRCed/encode_bitmaps.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import encode_bitmaps
+_rename(globals(), encode_bitmaps.__dict__, modulename='tools.XRCed.encode_bitmaps')
+del encode_bitmaps
+del _rename

wxPython/wx/tools/XRCed/globals.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import globals
+_rename(globals(), globals.__dict__, modulename='tools.XRCed.globals')
+del globals
+del _rename

wxPython/wx/tools/XRCed/images.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import images
+_rename(globals(), images.__dict__, modulename='tools.XRCed.images')
+del images
+del _rename

wxPython/wx/tools/XRCed/panel.py

@@ -0,0 +1,11 @@
+
+"""Renamer stub: provides a way to drop the wx prefix from wxPython objects."""
+
+__cvsid__ = "$Id$"
+__revision__ = "$Revision$"[11:-2]
+
+from wx import _rename
+from wxPython.tools.XRCed import panel
+_rename(globals(), panel.__dict__, modulename='tools.XRCed.panel')
+del panel
+del _rename