From: Xiang Zhang <angwerzx@126.com>
Date: Tue, 10 Jan 2017 02:56:38 +0000 (+0800)
Subject: Issue #29145: Merge 3.6.
X-Git-Tag: v3.7.0a1~1589
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a4da324dc441687dd38c360343698cdaa4c6014;p=thirdparty%2FPython%2Fcpython.git

Issue #29145: Merge 3.6.
---

7a4da324dc441687dd38c360343698cdaa4c6014
diff --cc Objects/stringlib/transmogrify.h
index a314572a72ba,a314572a72ba..326ce14849c9
--- a/Objects/stringlib/transmogrify.h
+++ b/Objects/stringlib/transmogrify.h
@@@ -261,7 -261,7 +261,7 @@@ stringlib_replace_interleave(PyObject *
      assert(count > 0);
      if (to_len > (PY_SSIZE_T_MAX - self_len) / count) {
          PyErr_SetString(PyExc_OverflowError,
--                        "replace bytes are too long");
++                        "replace bytes is too long");
          return NULL;
      }
      result_len = count * to_len + self_len;