mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 17:02:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

Browse source
This commit is contained in:
Sanyam Khurana 2017-08-18 17:48:14 +05:30 • committed by Nick Coghlan
parent f0202bb349
commit a7c449b8c0
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_print.py
View file

@ -161,14 +161,14 @@ class TestPy2MigrationHint(unittest.TestCase):
with self.assertRaises(TypeError) as context: with self.assertRaises(TypeError) as context:
print >> sys.stderr, "message" print >> sys.stderr, "message"
self.assertIn('Did you mean "print(<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 # Test correct hint is produced in the case where RHS implements
# __rrshift__ but returns NotImplemented # __rrshift__ but returns NotImplemented
with self.assertRaises(TypeError) as context: with self.assertRaises(TypeError) as context:
print >> 42 print >> 42
self.assertIn('Did you mean "print(<message>, ' 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 # Test stream redirection hint is specific to print
with self.assertRaises(TypeError) as context: with self.assertRaises(TypeError) as context:

2
Objects/abstract.c
View file

@ -827,7 +827,7 @@ binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name)
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"unsupported operand type(s) for %.100s: " "unsupported operand type(s) for %.100s: "
"'%.100s' and '%.100s'. Did you mean \"print(<message>, " "'%.100s' and '%.100s'. Did you mean \"print(<message>, "
"file=<output_stream>)\"", "file=<output_stream>)\"?",
op_name, op_name,
v->ob_type->tp_name, v->ob_type->tp_name,
w->ob_type->tp_name); w->ob_type->tp_name);