summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-11-03 01:45:46 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-11-03 01:45:46 (GMT)
commitcb2f84a21802a9e1776860b375745706fc570060 (patch)
tree08f2cab6d2f0b25ed15392a011bd88916a24636e
parent2662133a05d789de67aeaaad24aa86f49da95844 (diff)
downloadcpython-cb2f84a21802a9e1776860b375745706fc570060.zip
cpython-cb2f84a21802a9e1776860b375745706fc570060.tar.gz
cpython-cb2f84a21802a9e1776860b375745706fc570060.tar.bz2
Issue #13307: fix bdist_rpm test failures
-rw-r--r--Lib/distutils/command/build_py.py6
-rw-r--r--Lib/distutils/command/install_lib.py5
2 files changed, 6 insertions, 5 deletions
diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py
index 3868c12..9e2473f 100644
--- a/Lib/distutils/command/build_py.py
+++ b/Lib/distutils/command/build_py.py
@@ -3,7 +3,7 @@
Implements the Distutils 'build_py' command."""
import sys, os
-import sys
+import imp
from glob import glob
from distutils.core import Command
@@ -311,9 +311,9 @@ class build_py (Command):
outputs.append(filename)
if include_bytecode:
if self.compile:
- outputs.append(filename + "c")
+ outputs.append(imp.cache_from_source(filename, True))
if self.optimize > 0:
- outputs.append(filename + "o")
+ outputs.append(imp.cache_from_source(filename, False))
outputs += [
os.path.join(build_dir, filename)
diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py
index 3d01d07..8a6bc7d 100644
--- a/Lib/distutils/command/install_lib.py
+++ b/Lib/distutils/command/install_lib.py
@@ -4,6 +4,7 @@ Implements the Distutils 'install_lib' command
(install all Python modules)."""
import os
+import imp
import sys
from distutils.core import Command
@@ -164,9 +165,9 @@ class install_lib(Command):
if ext != PYTHON_SOURCE_EXTENSION:
continue
if self.compile:
- bytecode_files.append(py_file + "c")
+ bytecode_files.append(imp.cache_from_source(py_file, True))
if self.optimize > 0:
- bytecode_files.append(py_file + "o")
+ bytecode_files.append(imp.cache_from_source(py_file, False))
return bytecode_files