summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Dörwald <walter@livinglogic.de>2007-06-20 12:37:01 (GMT)
committerWalter Dörwald <walter@livinglogic.de>2007-06-20 12:37:01 (GMT)
commit38e6a69a20b975b9a079170e7875fac130a05659 (patch)
tree17956e516554fb79b329848f94bc116a96548ea5
parentbc1f886170286291ad270d1935bd61151e398110 (diff)
downloadcpython-38e6a69a20b975b9a079170e7875fac130a05659.zip
cpython-38e6a69a20b975b9a079170e7875fac130a05659.tar.gz
cpython-38e6a69a20b975b9a079170e7875fac130a05659.tar.bz2
Make pickle errror message unicode objects.
-rw-r--r--Modules/cPickle.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 0085560..8aa6eaa 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -393,13 +393,13 @@ cPickle_ErrFormat(PyObject *ErrType, char *stringformat, char *format, ...)
if (format) args = Py_VaBuildValue(format, va);
va_end(va);
if (format && ! args) return NULL;
- if (stringformat && !(retval=PyString_FromString(stringformat)))
+ if (stringformat && !(retval=PyUnicode_FromString(stringformat)))
return NULL;
if (retval) {
if (args) {
PyObject *v;
- v=PyString_Format(retval, args);
+ v=PyUnicode_Format(retval, args);
Py_DECREF(retval);
Py_DECREF(args);
if (! v) return NULL;