Rearranged things so that compilation of .py files is the responsibility

of the 'install_py' command rather than 'build_py'.  Obviously, this
meant that the 'build_py' and 'install_py' modules had to change; less
obviously, so did 'install' and 'build', since these higher-level
commands must make options available to control the lower-level
commands, and some compilation-related options had to migrate with the
code.

1 files changed, 1 insertions, 27 deletions

diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py
index 0ed8486..d956eef 100644
--- a/Lib/distutils/command/build_py.py
+++ b/Lib/distutils/command/build_py.py
@@ -15,21 +15,15 @@ from distutils.util import mkpath, newer, make_file, copy_file
 class BuildPy (Command):
 
     options = [('dir=', 'd', "directory for platform-shared files"),
-               ('compile', 'c', "compile .py to .pyc"),
-               ('optimize', 'o', "compile .py to .pyo (optimized)"),
               ]
 
 
     def set_default_options (self):
         self.dir = None
-        self.compile = 1
-        self.optimize = 1
 
     def set_final_options (self):
         self.set_undefined_options ('build',
-                                    ('libdir', 'dir'),
-                                    ('compile_py', 'compile'),
-                                    ('optimize_py', 'optimize'))
+                                    ('libdir', 'dir'))
 
 
     def run (self):
@@ -88,25 +82,5 @@ class BuildPy (Command):
                 created[outdir] = 1
 
             self.copy_file (infiles[i], outfiles[i])
-
-        # (Optionally) compile .py to .pyc
-        # XXX hey! we can't control whether we optimize or not; that's up
-        # to the invocation of the current Python interpreter (at least
-        # according to the py_compile docs).  That sucks.
-
-        if self.compile:
-            from py_compile import compile
-
-            for f in outfiles:
-                # XXX can't assume this filename mapping!
-                out_fn = string.replace (f, '.py', '.pyc')
-                
-                self.make_file (f, out_fn, compile, (f,),
-                                "compiling %s -> %s" % (f, out_fn),
-                                "compilation of %s skipped" % f)
-
-        # XXX ignore self.optimize for now, since we don't really know if
-        # we're compiling optimally or not, and couldn't pick what to do
-        # even if we did know.  ;-(
                        
 # end class BuildPy