Commit 16183631 authored by Georg Brandl's avatar Georg Brandl

Better fix for bug #1531405, not executing str(value) twice.

parent e9462c72
...@@ -202,15 +202,11 @@ def format_exception_only(etype, value): ...@@ -202,15 +202,11 @@ def format_exception_only(etype, value):
def _format_final_exc_line(etype, value): def _format_final_exc_line(etype, value):
"""Return a list of a single line -- normal case for format_exception_only""" """Return a list of a single line -- normal case for format_exception_only"""
try: valuestr = _some_str(value)
printable = value is None or not str(value) if value is None or not valuestr:
except:
printable = False
if printable:
line = "%s\n" % etype line = "%s\n" % etype
else: else:
line = "%s: %s\n" % (etype, _some_str(value)) line = "%s: %s\n" % (etype, valuestr)
return line return line
def _some_str(value): def _some_str(value):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment