[Python-checkins] cpython (merge 3.5 -> 3.6): merge 3.5 (#28454)

benjamin.peterson python-checkins at python.org
Sun Oct 16 18:42:53 EDT 2016


https://hg.python.org/cpython/rev/738579b25d02
changeset:   104516:738579b25d02
branch:      3.6
parent:      104512:1fc08c283f8f
parent:      104515:cbe313cd1b55
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Oct 16 15:42:24 2016 -0700
summary:
  merge 3.5 (#28454)

files:
  Objects/unicodeobject.c |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -3219,7 +3219,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;
     }
@@ -3280,7 +3280,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;
     }
@@ -3626,7 +3626,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;
 }
@@ -3655,7 +3655,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;
     }

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list