[Python-3000-checkins] r61771 - python/branches/py3k/Lib/distutils/command/build_py.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Sat Mar 22 23:07:43 2008
New Revision: 61771

Modified:
   python/branches/py3k/Lib/distutils/command/build_py.py
Log:
Invoke byte-compilation after running 2to3.


Modified: python/branches/py3k/Lib/distutils/command/build_py.py
==============================================================================
--- python/branches/py3k/Lib/distutils/command/build_py.py	(original)
+++ python/branches/py3k/Lib/distutils/command/build_py.py	Sat Mar 22 23:07:43 2008
@@ -386,9 +386,17 @@
 
 class build_py_2to3(build_py):
     def run(self):
-        from lib2to3.refactor import RefactoringTool
         self.updated_files = []
-        build_py.run(self)
+
+        # Base class code
+        if self.py_modules:
+            self.build_modules()
+        if self.packages:
+            self.build_packages()
+            self.build_package_data()
+
+        # 2to3
+        from lib2to3.refactor import RefactoringTool
         class Options:
             pass
         o = Options()
@@ -401,6 +409,9 @@
         r = RefactoringTool(o)
         r.refactor_args(self.updated_files)
 
+        # Remaining base class code
+        self.byte_compile(self.get_outputs(include_bytecode=0))
+
     def build_module(self, module, module_file, package):
         res = build_py.build_module(self, module, module_file, package)
         if res[1]: