mirror of
https://github.com/python/cpython.git
synced 2025-12-04 08:34:25 +00:00
module_repr(): use %U to format the file name
Avoid useless encode/decode of the filename
This commit is contained in:
parent
e3c7381c39
commit
8124feb07b
1 changed files with 15 additions and 5 deletions
|
|
@ -191,8 +191,8 @@ PyModule_GetName(PyObject *m)
|
||||||
return _PyUnicode_AsString(nameobj);
|
return _PyUnicode_AsString(nameobj);
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *
|
static PyObject*
|
||||||
PyModule_GetFilename(PyObject *m)
|
module_getfilename(PyObject *m)
|
||||||
{
|
{
|
||||||
PyObject *d;
|
PyObject *d;
|
||||||
PyObject *fileobj;
|
PyObject *fileobj;
|
||||||
|
|
@ -208,6 +208,16 @@ PyModule_GetFilename(PyObject *m)
|
||||||
PyErr_SetString(PyExc_SystemError, "module filename missing");
|
PyErr_SetString(PyExc_SystemError, "module filename missing");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
return fileobj;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *
|
||||||
|
PyModule_GetFilename(PyObject *m)
|
||||||
|
{
|
||||||
|
PyObject *fileobj;
|
||||||
|
fileobj = module_getfilename(m);
|
||||||
|
if (fileobj == NULL)
|
||||||
|
return NULL;
|
||||||
return _PyUnicode_AsString(fileobj);
|
return _PyUnicode_AsString(fileobj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -327,19 +337,19 @@ static PyObject *
|
||||||
module_repr(PyModuleObject *m)
|
module_repr(PyModuleObject *m)
|
||||||
{
|
{
|
||||||
const char *name;
|
const char *name;
|
||||||
const char *filename;
|
PyObject *filename;
|
||||||
|
|
||||||
name = PyModule_GetName((PyObject *)m);
|
name = PyModule_GetName((PyObject *)m);
|
||||||
if (name == NULL) {
|
if (name == NULL) {
|
||||||
PyErr_Clear();
|
PyErr_Clear();
|
||||||
name = "?";
|
name = "?";
|
||||||
}
|
}
|
||||||
filename = PyModule_GetFilename((PyObject *)m);
|
filename = module_getfilename((PyObject *)m);
|
||||||
if (filename == NULL) {
|
if (filename == NULL) {
|
||||||
PyErr_Clear();
|
PyErr_Clear();
|
||||||
return PyUnicode_FromFormat("<module '%s' (built-in)>", name);
|
return PyUnicode_FromFormat("<module '%s' (built-in)>", name);
|
||||||
}
|
}
|
||||||
return PyUnicode_FromFormat("<module '%s' from '%s'>", name, filename);
|
return PyUnicode_FromFormat("<module '%s' from '%U'>", name, filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue