less insane py2exe command replacement + distutils uses small caps cl…

…ass names for it's commands for usage in it's interface (ie setup.py --help-commands)

lib/pygtk2exe/__init__.py

@@ -22,15 +22,12 @@
 if not py2exe_version == '0.6.9':
     raise ImportError('pygtk2exe requires py2exe 0.6.9 but found %s' % py2exe_version)
 
-# Replace the py2exe command.
-from pygtk2exe.command import build_exe
 # Replace distutils' Distribution class
 from pygtk2exe import dist
 
 # Keep our "namespace" clean
 del warnings
 del py2exe_version
-del build_exe
 del dist
 
 # Make everything usable in setup.py scripts available

lib/pygtk2exe/command/build_exe.py

@@ -5,13 +5,13 @@
 
 from copy import copy
 
-from distutils.util import get_platform
-
 from py2exe.build_exe import py2exe as _py2exe
 from py2exe.py2exe_util import depends
 
 
-class PyGtk2Exe(_py2exe):
+class py2exe(_py2exe):
+    description = 'create a self-contained executable package for MS Windows'
+
     def __init__(self, dist):
         _py2exe.__init__(self, dist)
 
@@ -167,8 +167,3 @@ def copy_dlls(self, dlls):
                                     os.makedirs(dstdir)
 
                                 self.copy_file(src, dst, preserve_mode=False, preserve_times=True)
-
-
-# Replace py2exe.build_exe.py2exe with our own PyGtk2Exe class
-import py2exe
-py2exe.build_exe.py2exe = PyGtk2Exe

lib/pygtk2exe/command/build_ext.py

@@ -3,12 +3,12 @@
 
 import os
 
-from dsextras import BuildExt as _BuildExt
+from dsextras import BuildExt as _build_ext
 
 
-class BuildExt(_BuildExt):
+class build_ext(_build_ext):
     def run(self):
-        _BuildExt.run(self)
+        _build_ext.run(self)
 
         # This makes sure py2exe can locate the extension we've built
         build_lib = os.path.abspath(self.build_lib)

lib/pygtk2exe/command/clean.py

@@ -5,24 +5,24 @@
 
 from distutils import log
 from distutils.dir_util import remove_tree
-from distutils.command.clean import clean as _Clean
+from distutils.command.clean import clean as _clean
 
 
-class Clean(_Clean):
+class clean(_clean):
     def initialize_options(self):
-        _Clean.initialize_options(self)
+        _clean.initialize_options(self)
 
         self.dist_dir = None
         self.plat_name = None
 
     def finalize_options(self):
-        _Clean.finalize_options(self)
+        _clean.finalize_options(self)
 
         self.set_undefined_options('bdist', ('dist_dir', 'dist_dir'),
                                             ('plat_name', 'plat_name'))
 
     def run(self):
-        _Clean.run(self)
+        _clean.run(self)
 
         if self.all:
             exe_dist_dir = "%s.%s" % (self.distribution.get_fullname(), self.plat_name)

lib/pygtk2exe/dist.py

@@ -3,8 +3,9 @@
 
 from distutils.dist import Distribution as _Distribution
 
-from pygtk2exe.command.clean import Clean
-from pygtk2exe.command.build_ext import BuildExt
+from pygtk2exe.command.clean import clean
+from pygtk2exe.command.build_ext import build_ext
+from pygtk2exe.command.build_exe import py2exe
 from pygtk2exe.targets import Extension, CtypesComServer, ComServer, Service, Windows, Console, IsapiFilter
 
 
@@ -24,8 +25,9 @@ def __init__(self, attrs):
         _Distribution.__init__(self, attrs)
 
         # Replace distutils commands
-        self.cmdclass['build_ext'] = BuildExt
-        self.cmdclass['clean'] = Clean
+        self.cmdclass['clean'] = clean
+        self.cmdclass['build_ext'] = build_ext
+        self.cmdclass['py2exe'] = py2exe
 
         # Run "clean" and "py2exe" commands by default
         if not self.script_args: