Skip to content

C
cpython
Kaydet (Commit) 3aa75528 authored tarafından Benjamin Peterson's avatar Benjamin Peterson
Dosyalara gözat
Seçenekler

merge 3.5 (#28454)

üst b8bddec4 8d761ff0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
Objects/unicodeobject.c
Dosyayı görüntüle @ 3aa75528
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment