mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix distutils byte-compilation to comply with PEP 3147 (#11254).

Browse source 
Patch by Jeff Ramnani.  Tested with -B, -O and -OO.
This commit is contained in:
Éric Araujo 2011-10-08 00:34:13 +02:00
parent db95c7a60c
commit 47a4521ece
6 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/distutils/tests/test_build_py.py
View file

@ -3,6 +3,7 @@
import os
import sys
import io
import imp
import unittest
from distutils.command.build_py import build_py
@ -57,13 +58,15 @@ class BuildPyTestCase(support.TempdirManager,
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)
self.assertFalse(os.path.exists(pycache_dir))
else:
self.assertIn("__init__.pyc", files)
# XXX even with -O, distutils writes pyc, not pyo; bug?
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.

11
Lib/distutils/tests/test_install_lib.py
View file

@ -1,6 +1,7 @@
"""Tests for distutils.command.install_data."""
import sys
import os
import imp
import unittest
from distutils.command.install_lib import install_lib
@ -32,18 +33,20 @@ class InstallLibTestCase(support.TempdirManager,
cmd.finalize_options()
self.assertEqual(cmd.optimize, 2)
@unittest.skipUnless(not sys.dont_write_bytecode,
'byte-compile not supported')
@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 = cmd.optimize = 1
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')))
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()