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

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

Browse source 
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:54:40 +02:00
parent da6eb5305f
commit 53ffdc53bf
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Python/import.c
View file

@ -1763,6 +1763,7 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
saved_namelen = namelen;
#endif /* PYOS_OS2 */
for (fdp = _PyImport_Filetab; fdp->suffix != NULL; fdp++) {
struct stat statbuf;
#if defined(PYOS_OS2) && defined(HAVE_DYNAMIC_LOADING)
/* OS/2 limits DLLs to 8 character names (w/o
extension)
@ -1791,10 +1792,16 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
strcpy(buf+len, fdp->suffix);
if (Py_VerboseFlag > 1)
PySys_WriteStderr("# trying %s\n", buf);
filemode = fdp->mode;
if (filemode[0] == 'U')
filemode = "r" PY_STDIOTEXTMODE;
fp = fopen(buf, filemode);
if (stat(buf, &statbuf) == 0 && S_ISDIR(statbuf.st_mode))
/* it's a directory */
fp = NULL;
else
fp = fopen(buf, filemode);
if (fp != NULL) {
if (case_ok(buf, len, namelen, name))
break;