[Python-checkins] cpython (3.2): Backout d80207d15294.

[georg.brandl]

http://hg.python.org/cpython/rev/f27394782ed7
changeset:   86911:f27394782ed7
branch:      3.2
parent:      86861:7d399099334d
user:        Georg Brandl <georg at python.org>
date:        Mon Nov 04 07:43:32 2013 +0100
summary:
  Backout d80207d15294.

files:
  Lib/distutils/tests/test_build_py.py |  31 ----------------
  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
--- a/Lib/distutils/tests/test_build_py.py
+++ b/Lib/distutils/tests/test_build_py.py
@@ -121,37 +121,6 @@
         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]

-- 
Repository URL: http://hg.python.org/cpython