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

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

Browse source 
importing a module. Ignore the direcotry if its name matchs the module name
(e.g.  "__init__.py") and raise a ImportError instead.
This commit is contained in:
Victor Stinner 2011-09-23 18:59:08 +02:00
commit a1fe1f8dcf
3 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Python/import.c
View file

@ -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);