(original) (raw)

changeset: 104517:b37db216c8e0 parent: 104513:767a78aacd29 parent: 104516:738579b25d02 user: Benjamin Peterson benjamin@python.org date: Sun Oct 16 15:42:33 2016 -0700 files: Objects/unicodeobject.c description: merge 3.6 (#28454) diff -r 767a78aacd29 -r b37db216c8e0 Objects/unicodeobject.c --- a/Objects/unicodeobject.c Mon Oct 17 00:47:03 2016 +0300 +++ b/Objects/unicodeobject.c Sun Oct 16 15:42:33 2016 -0700 @@ -3215,7 +3215,7 @@ "'%.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; } @@ -3276,7 +3276,7 @@ "'%.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; } @@ -3622,7 +3622,7 @@ "'%.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; } @@ -3651,7 +3651,7 @@ "'%.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; } /benjamin@python.org