summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanyam Khurana <sanyam@sanyamkhurana.com>2017-08-18 17:48:14 +0530
committerNick Coghlan <ncoghlan@gmail.com>2017-08-18 22:18:14 +1000
commita7c449b8c08933deabcf329fb74ed1336f6db34f (patch)
tree6cb21a528e8a04300e5ee0aa8a53865b047184c7
parentf0202bb349986ff264d06b15058dcde4062b7b7a (diff)
downloadcpython-git-a7c449b8c08933deabcf329fb74ed1336f6db34f.tar.gz
bpo-30721: Add missing '?' to new error message (GH-3131)
-rw-r--r--Lib/test/test_print.py4
-rw-r--r--Objects/abstract.c2
2 files changed, 3 insertions, 3 deletions
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);