changeset:   104246:9abb316f1593
parent:      104244:d23ac799fe83
parent:      104245:e2d4e077cfb2
user:        Berker Peksag <berker.peksag@gmail.com>
date:        Sun Oct 02 13:08:47 2016 +0300
files:       Python/ceval.c
description:
Issue #27358: Merge from 3.6


diff -r d23ac799fe83 -r 9abb316f1593 Python/ceval.c
--- a/Python/ceval.c	Sun Oct 02 11:43:25 2016 +0200
+++ b/Python/ceval.c	Sun Oct 02 13:08:47 2016 +0300
@@ -2721,7 +2721,7 @@
                 if (PyDict_Update(sum, arg) < 0) {
                     if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
                         PyErr_Format(PyExc_TypeError,
-                                "'%.200s' object is not a mapping1",
+                                "'%.200s' object is not a mapping",
                                 arg->ob_type->tp_name);
                     }
                     Py_DECREF(sum);