Commit 8124feb0 authored by Victor Stinner's avatar Victor Stinner

module_repr(): use %U to format the file name

Avoid useless encode/decode of the filename
parent e3c7381c
...@@ -191,8 +191,8 @@ PyModule_GetName(PyObject *m) ...@@ -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) ...@@ -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 * ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment