Mercurial > cpython-lru_cache-weakref
diff Objects/moduleobject.c @ 64138:ee765a67c0b1
Issue #9425: Create PyModule_GetFilenameObject() function
... to get the filename as a unicode object, instead of a byte string. Function
needed to support unencodable filenames. Deprecate PyModule_GetFilename() in
favor on the new function.
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Tue, 17 Aug 2010 23:37:11 +0000 |
| parents | fa2d9720a66c |
| children | e2aa3b1d08bc |
line wrap: on
line diff
--- a/Objects/moduleobject.c Tue Aug 17 23:16:51 2010 +0000 +++ b/Objects/moduleobject.c Tue Aug 17 23:37:11 2010 +0000 @@ -188,8 +188,8 @@ return _PyUnicode_AsString(nameobj); } -static PyObject* -module_getfilename(PyObject *m) +PyObject* +PyModule_GetFilenameObject(PyObject *m) { PyObject *d; PyObject *fileobj; @@ -205,6 +205,7 @@ PyErr_SetString(PyExc_SystemError, "module filename missing"); return NULL; } + Py_INCREF(fileobj); return fileobj; } @@ -212,10 +213,13 @@ PyModule_GetFilename(PyObject *m) { PyObject *fileobj; - fileobj = module_getfilename(m); + char *utf8; + fileobj = PyModule_GetFilenameObject(m); if (fileobj == NULL) return NULL; - return _PyUnicode_AsString(fileobj); + utf8 = _PyUnicode_AsString(fileobj); + Py_DECREF(fileobj); + return utf8; } PyModuleDef* @@ -346,19 +350,21 @@ module_repr(PyModuleObject *m) { const char *name; - PyObject *filename; + PyObject *filename, *repr; name = PyModule_GetName((PyObject *)m); if (name == NULL) { PyErr_Clear(); name = "?"; } - filename = module_getfilename((PyObject *)m); + filename = PyModule_GetFilenameObject((PyObject *)m); if (filename == NULL) { PyErr_Clear(); return PyUnicode_FromFormat("<module '%s' (built-in)>", name); } - return PyUnicode_FromFormat("<module '%s' from '%U'>", name, filename); + repr = PyUnicode_FromFormat("<module '%s' from '%U'>", name, filename); + Py_DECREF(filename); + return repr; } static int
