Mercurial > cpython-lru_cache-weakref
diff Objects/moduleobject.c @ 42845:3152df70517a
Get rid of more uses of string and use const in a few places.
| author | Neal Norwitz <nnorwitz@gmail.com> |
|---|---|
| date | Sun, 26 Aug 2007 02:21:42 +0000 |
| parents | e70cdce0e8b2 |
| children | d5b52d56beba |
line wrap: on
line diff
--- a/Objects/moduleobject.c Sun Aug 26 02:06:15 2007 +0000 +++ b/Objects/moduleobject.c Sun Aug 26 02:21:42 2007 +0000 @@ -54,7 +54,7 @@ return d; } -char * +const char * PyModule_GetName(PyObject *m) { PyObject *d; @@ -79,7 +79,7 @@ return PyString_AsString(nameobj); } -char * +const char * PyModule_GetFilename(PyObject *m) { PyObject *d; @@ -120,8 +120,8 @@ /* First, clear only names starting with a single underscore */ pos = 0; while (PyDict_Next(d, &pos, &key, &value)) { - if (value != Py_None && PyString_Check(key)) { - char *s = PyString_AsString(key); + if (value != Py_None && PyUnicode_Check(key)) { + const char *s = PyUnicode_AsString(key); if (s[0] == '_' && s[1] != '_') { if (Py_VerboseFlag > 1) PySys_WriteStderr("# clear[1] %s\n", s); @@ -133,8 +133,8 @@ /* Next, clear all names except for __builtins__ */ pos = 0; while (PyDict_Next(d, &pos, &key, &value)) { - if (value != Py_None && PyString_Check(key)) { - char *s = PyString_AsString(key); + if (value != Py_None && PyUnicode_Check(key)) { + const char *s = PyUnicode_AsString(key); if (s[0] != '_' || strcmp(s, "__builtins__") != 0) { if (Py_VerboseFlag > 1) PySys_WriteStderr("# clear[2] %s\n", s); @@ -187,8 +187,8 @@ static PyObject * module_repr(PyModuleObject *m) { - char *name; - char *filename; + const char *name; + const char *filename; name = PyModule_GetName((PyObject *)m); if (name == NULL) {