mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 20:28:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

find_module(): use FS encoding to display the missing __init__ warning

Browse source
This commit is contained in:
Victor Stinner 2010-10-17 02:07:09 +00:00
parent e3874ed7dd
commit ed7916dd00
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Python/import.c
View file

@ -1736,14 +1736,16 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
return &fd_package; return &fd_package;
} }
else { else {
char warnstr[MAXPATHLEN+80]; int err;
sprintf(warnstr, "Not importing directory " PyObject *unicode = PyUnicode_DecodeFSDefault(buf);
"'%.*s': missing __init__.py", if (unicode == NULL)
MAXPATHLEN, buf); return NULL;
if (PyErr_WarnEx(PyExc_ImportWarning, err = PyErr_WarnFormat(PyExc_ImportWarning, 1,
warnstr, 1)) { "Not importing directory '%U': missing __init__.py",
unicode);
Py_DECREF(unicode);
if (err)
return NULL; return NULL;
}
} }
} }
#endif #endif