Make pickle errror message unicode objects.

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 00855604066dbd3bc3c97d22fa70dede49c02cd5..8aa6eaa7f8507e0c35f46d7c8a51b97af1f51750 100644 (file)
--- 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;