mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Issue #3080: Add PyModule_GetNameObject()

Browse source 
repr(module) uses %R to format module name and filenames, instead of '%s' and
'%U', so surrogates from undecodable bytes in a filename (PEP 383) are escaped.
This commit is contained in:
Victor Stinner 2011-02-23 00:21:43 +00:00
parent 501c09a754
commit bd475115c4
3 changed files with 45 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Objects/moduleobject.c
View file

@ -169,24 +169,35 @@ PyModule_GetDict(PyObject *m)
return d;
}
const char *
PyModule_GetName(PyObject *m)
PyObject*
PyModule_GetNameObject(PyObject *m)
{
PyObject *d;
PyObject *nameobj;
PyObject *name;
if (!PyModule_Check(m)) {
PyErr_BadArgument();
return NULL;
}
d = ((PyModuleObject *)m)->md_dict;
if (d == NULL ||
(nameobj = PyDict_GetItemString(d, "__name__")) == NULL ||
!PyUnicode_Check(nameobj))
(name = PyDict_GetItemString(d, "__name__")) == NULL ||
!PyUnicode_Check(name))
{
PyErr_SetString(PyExc_SystemError, "nameless module");
return NULL;
}
return _PyUnicode_AsString(nameobj);
Py_INCREF(name);
return name;
}
const char *
PyModule_GetName(PyObject *m)
{
PyObject *name = PyModule_GetNameObject(m);
if (name == NULL)
return NULL;
Py_DECREF(name); /* module dict has still a reference */
return _PyUnicode_AsString(name);
}
PyObject*
@ -219,7 +230,7 @@ PyModule_GetFilename(PyObject *m)
if (fileobj == NULL)
return NULL;
utf8 = _PyUnicode_AsString(fileobj);
Py_DECREF(fileobj);
Py_DECREF(fileobj); /* module dict has still a reference */
return utf8;
}
@ -347,21 +358,25 @@ module_dealloc(PyModuleObject *m)
static PyObject *
module_repr(PyModuleObject *m)
{
const char *name;
PyObject *filename, *repr;
PyObject *name, *filename, *repr;
name = PyModule_GetName((PyObject *)m);
name = PyModule_GetNameObject((PyObject *)m);
if (name == NULL) {
PyErr_Clear();
name = "?";
name = PyUnicode_FromStringAndSize("?", 1);
if (name == NULL)
return NULL;
}
filename = PyModule_GetFilenameObject((PyObject *)m);
if (filename == NULL) {
PyErr_Clear();
return PyUnicode_FromFormat("<module '%s' (built-in)>", name);
repr = PyUnicode_FromFormat("<module %R (built-in)>", name);
}
repr = PyUnicode_FromFormat("<module '%s' from '%U'>", name, filename);
Py_DECREF(filename);
else {
repr = PyUnicode_FromFormat("<module %R from %R>", name, filename);
Py_DECREF(filename);
}
Py_DECREF(name);
return repr;
}