diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-10-16 22:42:33 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-10-16 22:42:33 (GMT) |
| commit | d6d49f16f40338ee7910e1b0cc8c36bdf0170ac3 (patch) | |
| tree | 181e997deb91ec79d0eedf3ec746a789851d580d | |
| parent | 6849313ac3e60d5ad19e0f072c367fe9a1f60cae (diff) | |
| parent | 3aa75528a1eb47b1f3bd5b681bacf9dab27186b9 (diff) | |
| download | cpython-d6d49f16f40338ee7910e1b0cc8c36bdf0170ac3.zip cpython-d6d49f16f40338ee7910e1b0cc8c36bdf0170ac3.tar.gz cpython-d6d49f16f40338ee7910e1b0cc8c36bdf0170ac3.tar.bz2 | |
merge 3.6 (#28454)
| -rw-r--r-- | Objects/unicodeobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index d4bce81..f92813c 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3215,7 +3215,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; } @@ -3276,7 +3276,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; } @@ -3622,7 +3622,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; } @@ -3651,7 +3651,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; } |