Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

remove extra PyErr_Format arguments (closes #28454) 

Patch from Xiang Zhang.
This commit is contained in:
Benjamin Peterson 2016-10-16 15:41:46 -07:00
parent 90e028970a
commit 8d761ff045
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Objects/unicodeobject.c
View File

@ -3009,7 +3009,7 @@ PyUnicode_Decode(const char *s,
"'%.400s' decoder returned '%.400s' instead of 'str'; "
"use codecs.decode() to decode to arbitrary types",
encoding,
Py_TYPE(unicode)->tp_name, Py_TYPE(unicode)->tp_name);
Py_TYPE(unicode)->tp_name);
Py_DECREF(unicode);
goto onError;
}
@ -3070,7 +3070,7 @@ PyUnicode_AsDecodedUnicode(PyObject *unicode,
"'%.400s' decoder returned '%.400s' instead of 'str'; "
"use codecs.decode() to decode to arbitrary types",
encoding,
Py_TYPE(unicode)->tp_name, Py_TYPE(unicode)->tp_name);
Py_TYPE(unicode)->tp_name);
Py_DECREF(v);
goto onError;
}
@ -3398,7 +3398,7 @@ PyUnicode_AsEncodedString(PyObject *unicode,
"'%.400s' encoder returned '%.400s' instead of 'bytes'; "
"use codecs.encode() to encode to arbitrary types",
encoding,
Py_TYPE(v)->tp_name, Py_TYPE(v)->tp_name);
Py_TYPE(v)->tp_name);
Py_DECREF(v);
return NULL;
}
@ -3427,7 +3427,7 @@ PyUnicode_AsEncodedUnicode(PyObject *unicode,
"'%.400s' encoder returned '%.400s' instead of 'str'; "
"use codecs.encode() to encode to arbitrary types",
encoding,
Py_TYPE(v)->tp_name, Py_TYPE(v)->tp_name);
Py_TYPE(v)->tp_name);
Py_DECREF(v);
goto onError;
}