From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 15 Oct 2017 04:01:28 +0000 (-0700)
Subject: [3.6] bpo-31780: Fix incorrect error message for ',x', ',b', ',o' specs (GH-4002... 
X-Git-Tag: v3.6.4rc1~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59b5c139d2ae95b1d1da63f81c3d777932215533;p=thirdparty%2FPython%2Fcpython.git

[3.6] bpo-31780: Fix incorrect error message for ',x', ',b', ',o' specs (GH-4002) (#4004)

Patch by Pablo.
(cherry picked from commit 28773ca7a7aa58a28e42a9eb0066acf71b5a8dc4)
---

diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c
index 9192bfd6a670..d2be76f1e1a8 100644
--- a/Python/formatter_unicode.c
+++ b/Python/formatter_unicode.c
@@ -32,11 +32,11 @@ invalid_comma_type(Py_UCS4 presentation_type)
 {
     if (presentation_type > 32 && presentation_type < 128)
         PyErr_Format(PyExc_ValueError,
-                     "Cannot specify ',' or '_' with '%c'.",
+                     "Cannot specify ',' with '%c'.",
                      (char)presentation_type);
     else
         PyErr_Format(PyExc_ValueError,
-                     "Cannot specify ',' or '_' with '\\x%x'.",
+                     "Cannot specify ',' with '\\x%x'.",
                      (unsigned int)presentation_type);
 }