summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-11-04 06:43:32 (GMT)
committerGeorg Brandl <georg@python.org>2013-11-04 06:43:32 (GMT)
commit7ec3e56bb8923ed17614c2f37ca9c2020bdabac5 (patch)
tree121510ffb88b5d9c908a78763e2b5fd9ca4ab36f
parent32bf5e1273621c926e21274afec12f4fea97fb03 (diff)
downloadcpython-7ec3e56bb8923ed17614c2f37ca9c2020bdabac5.zip
cpython-7ec3e56bb8923ed17614c2f37ca9c2020bdabac5.tar.gz
cpython-7ec3e56bb8923ed17614c2f37ca9c2020bdabac5.tar.bz2
Backout d80207d15294.
-rw-r--r--Lib/distutils/tests/test_build_py.py31
1 files changed, 0 insertions, 31 deletions
diff --git a/Lib/distutils/tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py
index 2ce9d44..e416edd 100644
--- a/Lib/distutils/tests/test_build_py.py
+++ b/Lib/distutils/tests/test_build_py.py
@@ -121,37 +121,6 @@ class BuildPyTestCase(support.TempdirManager,
found = os.listdir(os.path.join(cmd.build_lib, '__pycache__'))
self.assertEqual(sorted(found), ['boiledeggs.%s.pyo' % imp.get_tag()])
- def test_dir_in_package_data(self):
- """
- A directory in package_data should not be added to the filelist.
- """
- # See bug 19286
- sources = self.mkdtemp()
- pkg_dir = os.path.join(sources, "pkg")
-
- os.mkdir(pkg_dir)
- open(os.path.join(pkg_dir, "__init__.py"), "w").close()
-
- docdir = os.path.join(pkg_dir, "doc")
- os.mkdir(docdir)
- open(os.path.join(docdir, "testfile"), "w").close()
-
- # create the directory that could be incorrectly detected as a file
- os.mkdir(os.path.join(docdir, 'otherdir'))
-
- os.chdir(sources)
- dist = Distribution({"packages": ["pkg"],
- "package_data": {"pkg": ["doc/*"]}})
- # script_name need not exist, it just need to be initialized
- dist.script_name = os.path.join(sources, "setup.py")
- dist.script_args = ["build"]
- dist.parse_command_line()
-
- try:
- dist.run_commands()
- except DistutilsFileError:
- self.fail("failed package_data when data dir includes a dir")
-
def test_dont_write_bytecode(self):
# makes sure byte_compile is not used
dist = self.create_dist()[1]