Fix packaging byte-compilation to comply with PEP 3147 (#11254).
I want to replace custom byte-compiling function with calls to
compileall before 3.3b1, but in the short term it’s good to have this
fixed.
Adapted from the distutils patch by Jeff Ramnani. I tested with -B, -O
and -OO; test_util and test_mixin2to3 fail in -O mode because lib2to3
doesn’t support it.
diff --git a/Lib/packaging/util.py b/Lib/packaging/util.py
index 89f5389..f8a8058 100644
--- a/Lib/packaging/util.py
+++ b/Lib/packaging/util.py
@@ -3,6 +3,7 @@
import os
import re
import csv
+import imp
import sys
import errno
import shutil
@@ -296,7 +297,7 @@
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 a __pycache__ subdirectory.
'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 +416,10 @@
# 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 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: