summaryrefslogtreecommitdiff
path: root/Objects/moduleobject.c
diff options
context:
space:
mode:
authorWalter Dörwald <walter@livinglogic.de>2007-05-18 17:15:44 +0000
committerWalter Dörwald <walter@livinglogic.de>2007-05-18 17:15:44 +0000
commit6d719b850b7360f9ba5476e4467e28d69f90cf38 (patch)
treedde3e729ef3cb150712e871def8409be7feafb5a /Objects/moduleobject.c
parenta1af0cb75709145d565ad6e975f108d8dd14bb5b (diff)
downloadcpython-6d719b850b7360f9ba5476e4467e28d69f90cf38.tar.gz
Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror
PyString_Concat() and PyString_ConcatAndDel() (the name PyUnicode_Concat() was already taken). Change PyObject_Repr() to always return a unicode object. Update all repr implementations to return unicode objects. Add a function PyObject_ReprStr8() that calls PyObject_Repr() and converts the result to an 8bit string. Use PyObject_ReprStr8() where using PyObject_Repr() can't be done straightforward.
Diffstat (limited to 'Objects/moduleobject.c')
-rw-r--r--Objects/moduleobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index f1885156ea..daf24eb2d8 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -198,9 +198,9 @@ module_repr(PyModuleObject *m)
filename = PyModule_GetFilename((PyObject *)m);
if (filename == NULL) {
PyErr_Clear();
- return PyString_FromFormat("<module '%s' (built-in)>", name);
+ return PyUnicode_FromFormat("<module '%s' (built-in)>", name);
}
- return PyString_FromFormat("<module '%s' from '%s'>", name, filename);
+ return PyUnicode_FromFormat("<module '%s' from '%s'>", name, filename);
}
/* We only need a traverse function, no clear function: If the module