From 8d761ff045ab3aa6787d1ee8dc2ee4b39b424a64 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 16 Oct 2016 15:41:46 -0700 Subject: [PATCH] remove extra PyErr_Format arguments (closes #28454) Patch from Xiang Zhang. --- Objects/unicodeobject.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index b734eecf9c5..19549cde572 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -3009,7 +3009,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; } @@ -3070,7 +3070,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; } @@ -3398,7 +3398,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; } @@ -3427,7 +3427,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; }