Browse Source

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

pull/3134/head
Sanyam Khurana 9 years ago
committed by Nick Coghlan
parent
commit
a7c449b8c0
  1. 4
      Lib/test/test_print.py
  2. 2
      Objects/abstract.c

4
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:

2
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);

Loading…
Cancel
Save