diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-10-16 22:42:24 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-10-16 22:42:24 (GMT) |
| commit | 3aa75528a1eb47b1f3bd5b681bacf9dab27186b9 (patch) | |
| tree | 94c2767d02db9363b3a7b75b0034375216593440 /Objects | |
| parent | b8bddec4e0bb222cd60b76ad48c19e3aa5c19841 (diff) | |
| parent | 8d761ff045ab3aa6787d1ee8dc2ee4b39b424a64 (diff) | |
| download | cpython-3aa75528a1eb47b1f3bd5b681bacf9dab27186b9.zip cpython-3aa75528a1eb47b1f3bd5b681bacf9dab27186b9.tar.gz cpython-3aa75528a1eb47b1f3bd5b681bacf9dab27186b9.tar.bz2 | |
merge 3.5 (#28454)
Diffstat (limited to 'Objects')
| -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 99069cd..adeec8c 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3219,7 +3219,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; } @@ -3280,7 +3280,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; } @@ -3626,7 +3626,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; } @@ -3655,7 +3655,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; } |