mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 15:42:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Ensure that code object names (co_name) are unicode.

Browse source 
Verify that they print properly too.
This commit is contained in:
Neal Norwitz 2007-08-24 23:12:06 +00:00
parent a5d16a3f85
commit 41103bf6f2
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Objects/codeobject.c
View file

@ -65,6 +65,13 @@ PyCode_New(int argcount, int kwonlyargcount,
PyErr_BadInternalCall();
return NULL;
}
if (PyString_Check(name)) {
name = PyUnicode_FromString(PyString_AS_STRING(name));
if (name == NULL)
return NULL;
} else {
Py_INCREF(name);
}
intern_strings(names);
intern_strings(varnames);
intern_strings(freevars);
@ -106,6 +113,7 @@ PyCode_New(int argcount, int kwonlyargcount,
co->co_lnotab = lnotab;
co->co_zombieframe = NULL;
}
Py_DECREF(name);
return co;
}
@ -288,17 +296,14 @@ code_repr(PyCodeObject *co)
{
int lineno = -1;
char *filename = "???";
char *name = "???";
if (co->co_firstlineno != 0)
lineno = co->co_firstlineno;
if (co->co_filename && PyString_Check(co->co_filename))
filename = PyString_AS_STRING(co->co_filename);
if (co->co_name && PyString_Check(co->co_name))
name = PyString_AS_STRING(co->co_name);
return PyUnicode_FromFormat(
"<code object %.100s at %p, file \"%.300s\", line %d>",
name, co, filename, lineno);
"<code object %.100U at %p, file \"%.300s\", line %d>",
co->co_name, co, filename, lineno);
}
static PyObject *