From: Sanyam Khurana <sanyam@sanyamkhurana.com>
Date: Fri, 18 Aug 2017 12:18:14 +0000 (+0530)
Subject: bpo-30721: Add missing '?' to new error message (GH-3131)
X-Git-Tag: v3.7.0a1~258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7c449b8c08933deabcf329fb74ed1336f6db34f;p=python

bpo-30721: Add missing '?' to new error message (GH-3131)
---

diff --git a/Lib/test/test_print.py b/Lib/test/test_print.py
index 80993279b8..e6434feaf5 100644
--- a/Lib/test/test_print.py
+++ b/Lib/test/test_print.py
@@ -161,14 +161,14 @@ class TestPy2MigrationHint(unittest.TestCase):
         with self.assertRaises(TypeError) as context:
             print >> sys.stderr, "message"
         self.assertIn('Did you mean "print(<message>, '
-                'file=<output_stream>)', str(context.exception))
+                'file=<output_stream>)"?', str(context.exception))
 
         # Test correct hint is produced in the case where RHS implements
         # __rrshift__ but returns NotImplemented
         with self.assertRaises(TypeError) as context:
             print >> 42
         self.assertIn('Did you mean "print(<message>, '
-                'file=<output_stream>)', str(context.exception))
+                'file=<output_stream>)"?', str(context.exception))
 
         # Test stream redirection hint is specific to print
         with self.assertRaises(TypeError) as context:
diff --git a/Objects/abstract.c b/Objects/abstract.c
index abd97953bd..66ac0e3ea7 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -827,7 +827,7 @@ binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name)
             PyErr_Format(PyExc_TypeError,
                 "unsupported operand type(s) for %.100s: "
                 "'%.100s' and '%.100s'. Did you mean \"print(<message>, "
-                "file=<output_stream>)\"",
+                "file=<output_stream>)\"?",
                 op_name,
                 v->ob_type->tp_name,
                 w->ob_type->tp_name);