traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #3080: PyImport_Cleanup() uses Unicode 

Replace strcmp() by PyUnicode_CompareWithASCIIString()
This commit is contained in:
Victor Stinner 2011-03-07 17:08:21 +01:00
parent f6b563af2d
commit 9464d61cba
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Python/import.c
View File

@ -418,7 +418,6 @@ void
PyImport_Cleanup(void)
{
Py_ssize_t pos, ndone;
char *name;
PyObject *key, *value, *dict;
PyInterpreterState *interp = PyThreadState_GET()->interp;
PyObject *modules = interp->modules;
@ -491,14 +490,13 @@ PyImport_Cleanup(void)
if (value->ob_refcnt != 1)
continue;
if (PyUnicode_Check(key) && PyModule_Check(value)) {
name = _PyUnicode_AsString(key);
if (strcmp(name, "builtins") == 0)
if (PyUnicode_CompareWithASCIIString(key, "builtins") == 0)
continue;
if (strcmp(name, "sys") == 0)
if (PyUnicode_CompareWithASCIIString(key, "sys") == 0)
continue;
if (Py_VerboseFlag)
PySys_WriteStderr(
"# cleanup[1] %s\n", name);
PySys_FormatStderr(
"# cleanup[1] %U\n", key);
_PyModule_Clear(value);
PyDict_SetItem(modules, key, Py_None);
ndone++;
@ -510,13 +508,12 @@ PyImport_Cleanup(void)
pos = 0;
while (PyDict_Next(modules, &pos, &key, &value)) {
if (PyUnicode_Check(key) && PyModule_Check(value)) {
name = _PyUnicode_AsString(key);
if (strcmp(name, "builtins") == 0)
if (PyUnicode_CompareWithASCIIString(key, "builtins") == 0)
continue;
if (strcmp(name, "sys") == 0)
if (PyUnicode_CompareWithASCIIString(key, "sys") == 0)
continue;
if (Py_VerboseFlag)
PySys_WriteStderr("# cleanup[2] %s\n", name);
PySys_FormatStderr("# cleanup[2] %U\n", key);
_PyModule_Clear(value);
PyDict_SetItem(modules, key, Py_None);
}