Merge 3.2: Issue #7732: Don't open a directory as a file anymore while

importing a module. Ignore the direcotry if its name matchs the module name
(e.g.  "__init__.py") and raise a ImportError instead.

3 files changed, 23 insertions, 1 deletions

diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index a1cebf91e5..6cbd218ce2 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -139,6 +139,15 @@ class ImportTests(unittest.TestCase):
             self.assertIs(orig_path, new_os.path)
             self.assertIsNot(orig_getenv, new_os.getenv)
 
+    def test_bug7732(self):
+        source = TESTFN + '.py'
+        os.mkdir(source)
+        try:
+            self.assertRaisesRegex(ImportError, '^No module',
+                imp.find_module, TESTFN, ["."])
+        finally:
+            os.rmdir(source)
+
     def test_module_with_large_stack(self, module='longlist'):
         # Regression test for http://bugs.python.org/issue561858.
         filename = module + '.py'
diff --git a/Misc/NEWS b/Misc/NEWS
index 571db4b2f1..0e18621d23 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.3 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #7732: Don't open a directory as a file anymore while importing a
+  module. Ignore the direcotry if its name matchs the module name (e.g.
+  "__init__.py") and raise a ImportError instead.
+
 - Issue #13021: Missing decref on an error path.  Thanks to Suman Saha for
   finding the bug and providing a patch.
 
@@ -291,7 +295,7 @@ Library
   ZLIB_RUNTIME_VERSION, in the zlib module. Patch by Torsten Landschoff.
 
 - Issue #12959: Add collections.ChainMap to collections.__all__.
- 
+
 - Issue #8933: distutils' PKG-INFO files and packaging's METADATA files will
   now correctly report Metadata-Version: 1.1 instead of 1.0 if a Classifier or
   Download-URL field is present.
diff --git a/Python/import.c b/Python/import.c
index adfd2cc5df..24df985d46 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1892,6 +1892,8 @@ find_module_path_list(PyObject *fullname, PyObject *name,
         }
 
         for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
+            struct stat statbuf;
+
             filemode = fdp->mode;
             if (filemode[0] == 'U')
                 filemode = "r" PY_STDIOTEXTMODE;
@@ -1905,6 +1907,13 @@ find_module_path_list(PyObject *fullname, PyObject *name,
             if (Py_VerboseFlag > 1)
                 PySys_FormatStderr("# trying %R\n", filename);
 
+            if (_Py_stat(filename, &statbuf) == 0 &&         /* it exists */
+                S_ISDIR(statbuf.st_mode))           /* it's a directory */
+            {
+                Py_DECREF(filename);
+                continue;
+            }
+
             fp = _Py_fopen(filename, filemode);
             if (fp == NULL) {
                 Py_DECREF(filename);