[Python-checkins] distutils2 (python3): Fix byte-compilation to comply with PEP 3147 on Python 3.2+ (#11254).

[eric.araujo]

http://hg.python.org/distutils2/rev/7a875901c205
changeset:   1208:7a875901c205
branch:      python3
parent:      1205:b9f449eb1e36
user:        Éric Araujo <merwok at netwok.org>
date:        Sat Oct 08 03:51:57 2011 +0200
summary:
  Fix byte-compilation to comply with PEP 3147 on Python 3.2+ (#11254).

I want to replace custom byte-compiling function with calls to
compileall before 1.0, but in the short term it’s good to have this
fixed.

Adapted from the distutils patch by Jeff Ramnani.  Tested with -B, -O
and -OO on 3.1, 3.2 and 3.3.

files:
  distutils2/tests/test_command_build_py.py    |  15 ++++++++--
  distutils2/tests/test_command_install_lib.py |  14 +++++++--
  distutils2/util.py                           |  15 ++++++++-
  3 files changed, 36 insertions(+), 8 deletions(-)


diff --git a/distutils2/tests/test_command_build_py.py b/distutils2/tests/test_command_build_py.py
--- a/distutils2/tests/test_command_build_py.py
+++ b/distutils2/tests/test_command_build_py.py
@@ -2,6 +2,7 @@
 
 import os
 import sys
+import imp
 
 from distutils2.command.build_py import build_py
 from distutils2.dist import Distribution
@@ -58,13 +59,21 @@
         self.assertEqual(len(cmd.get_outputs()), 3)
         pkgdest = os.path.join(destination, "pkg")
         files = os.listdir(pkgdest)
+        pycache_dir = os.path.join(pkgdest, "__pycache__")
         self.assertIn("__init__.py", files)
         self.assertIn("README.txt", files)
-        # XXX even with -O, distutils writes pyc, not pyo; bug?
         if sys.dont_write_bytecode:
-            self.assertNotIn("__init__.pyc", files)
+            if sys.version_info[1] == 1:
+                self.assertNotIn("__init__.pyc", files)
+            else:
+                self.assertFalse(os.path.exists(pycache_dir))
         else:
-            self.assertIn("__init__.pyc", files)
+            # XXX even with -O, distutils2 writes pyc, not pyo; bug?
+            if sys.version_info[1] == 1:
+                self.assertIn("__init__.pyc", files)
+            else:
+                pyc_files = os.listdir(pycache_dir)
+                self.assertIn("__init__.%s.pyc" % imp.get_tag(), pyc_files)
 
     def test_empty_package_dir(self):
         # See SF 1668596/1720897.
diff --git a/distutils2/tests/test_command_install_lib.py b/distutils2/tests/test_command_install_lib.py
--- a/distutils2/tests/test_command_install_lib.py
+++ b/distutils2/tests/test_command_install_lib.py
@@ -1,6 +1,7 @@
 """Tests for distutils2.command.install_data."""
+import os
 import sys
-import os
+import imp
 
 from distutils2.tests import unittest, support
 from distutils2.command.install_lib import install_lib
@@ -36,6 +37,7 @@
     @unittest.skipIf(sys.dont_write_bytecode, 'byte-compile disabled')
     def test_byte_compile(self):
         pkg_dir, dist = self.create_dist()
+        os.chdir(pkg_dir)
         cmd = install_lib(dist)
         cmd.compile = True
         cmd.optimize = 1
@@ -43,8 +45,14 @@
         f = os.path.join(pkg_dir, 'foo.py')
         self.write_file(f, '# python file')
         cmd.byte_compile([f])
-        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyc')))
-        self.assertTrue(os.path.exists(os.path.join(pkg_dir, 'foo.pyo')))
+        if sys.version_info[1] == 1:
+            pyc_file = 'foo.pyc'
+            pyo_file = 'foo.pyo'
+        else:
+            pyc_file = imp.cache_from_source('foo.py')
+            pyo_file = imp.cache_from_source('foo.py', debug_override=False)
+        self.assertTrue(os.path.exists(pyc_file))
+        self.assertTrue(os.path.exists(pyo_file))
 
     def test_get_outputs(self):
         pkg_dir, dist = self.create_dist()
diff --git a/distutils2/util.py b/distutils2/util.py
--- a/distutils2/util.py
+++ b/distutils2/util.py
@@ -3,6 +3,7 @@
 import os
 import re
 import csv
+import imp
 import sys
 import errno
 import shutil
@@ -296,7 +297,8 @@
 def byte_compile(py_files, optimize=0, force=False, prefix=None,
                  base_dir=None, verbose=0, dry_run=False, direct=None):
     """Byte-compile a collection of Python source files to either .pyc
-    or .pyo files in the same directory.
+    or .pyo files in the same directory (Python 3.1) or in a __pycache__
+    subdirectory (3.2 and newer).
 
     'py_files' is a list of files to compile; any files that don't end in
     ".py" are silently skipped. 'optimize' must be one of the following:
@@ -415,7 +417,16 @@
             # Terminology from the py_compile module:
             #   cfile - byte-compiled file
             #   dfile - purported source filename (same as 'file' by default)
-            cfile = file + (__debug__ and "c" or "o")
+            if sys.version_info[1] == 1:
+                cfile = file + (__debug__ and "c" or "o")
+            else:
+                # comply with PEP 3147 in 3.2+
+                if optimize >= 0:
+                    cfile = imp.cache_from_source(file,
+                                                  debug_override=not optimize)
+                else:
+                    cfile = imp.cache_from_source(file)
+
             dfile = file
             if prefix:
                 if file[:len(prefix)] != prefix:

-- 
Repository URL: http://hg.python.org/distutils2