Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

MacPython-OS9 specific fix: If there are non-string items on sys.path don't try to intern them. This has the theoretical problem that resource filenames on sys.path cannot be unicode objects, but in practice that shouldn't matter.

This commit is contained in:
Jack Jansen 2003-01-24 16:15:45 +00:00
parent 0064026668
commit 9363dca3f8
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Python/import.c
View File

@ -1214,23 +1214,26 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
** Speedup: each sys.path item is interned, and ** Speedup: each sys.path item is interned, and
** FindResourceModule remembers which items refer to ** FindResourceModule remembers which items refer to
** folders (so we don't have to bother trying to look ** folders (so we don't have to bother trying to look
** into them for resources). ** into them for resources). We only do this for string
** items.
*/ */
PyString_InternInPlace(&PyList_GET_ITEM(path, i)); if (PyString_Check(PyList_GET_ITEM(path, i))) {
v = PyList_GET_ITEM(path, i); PyString_InternInPlace(&PyList_GET_ITEM(path, i));
if (PyMac_FindResourceModule((PyStringObject *)v, name, buf)) { v = PyList_GET_ITEM(path, i);
static struct filedescr resfiledescr = if (PyMac_FindResourceModule((PyStringObject *)v, name, buf)) {
{"", "", PY_RESOURCE}; static struct filedescr resfiledescr =
{"", "", PY_RESOURCE};
Py_XDECREF(copy); Py_XDECREF(copy);
return &resfiledescr; return &resfiledescr;
} }
if (PyMac_FindCodeResourceModule((PyStringObject *)v, name, buf)) { if (PyMac_FindCodeResourceModule((PyStringObject *)v, name, buf)) {
static struct filedescr resfiledescr = static struct filedescr resfiledescr =
{"", "", PY_CODERESOURCE}; {"", "", PY_CODERESOURCE};
Py_XDECREF(copy); Py_XDECREF(copy);
return &resfiledescr; return &resfiledescr;
}
} }
#endif #endif
if (len > 0 && buf[len-1] != SEP if (len > 0 && buf[len-1] != SEP