traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.6 (#28454)

This commit is contained in:
Benjamin Peterson 2016-10-16 15:42:33 -07:00
parent 6849313ac3 3aa75528a1
commit d6d49f16f4
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

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