Merge touch-ups and fixes for #9831 (+port fix to packaging) and #9223 from 3.2

This commit is contained in:
Éric Araujo 2011-05-29 00:56:39 +02:00
commit 601aba6f15
6 changed files with 99 additions and 89 deletions

View file

@ -61,9 +61,12 @@ class BuildPyTestCase(support.TempdirManager,
pkgdest = os.path.join(destination, "pkg")
files = os.listdir(pkgdest)
self.assertIn("__init__.py", files)
if not sys.dont_write_bytecode:
self.assertIn("__init__.pyc", 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)
else:
self.assertIn("__init__.pyc", files)
def test_empty_package_dir(self):
# See SF 1668596/1720897.
@ -93,7 +96,7 @@ class BuildPyTestCase(support.TempdirManager,
try:
dist.run_commands()
except PackagingFileError as e:
except PackagingFileError:
self.fail("failed package_data test when package_dir is ''")
finally:
# Restore state.