Fix a bug in traceback.format_exception_only() that led to an error

being raised when print_exc() was called without an exception set.
In version 2.4, this printed "None", restored that behavior.
This commit is contained in:
Georg Brandl 2006-09-24 12:50:24 +00:00
parent a10d3afed2
commit c7986cee76
3 changed files with 9 additions and 1 deletions

View File

@ -149,6 +149,10 @@ def test():
str_value = '<unprintable %s object>' % X.__name__
self.assertEqual(err[0], X.__name__ + ': ' + str_value + '\n')
def test_without_exception(self):
err = traceback.format_exception_only(None, None)
self.assertEqual(err, ['None\n'])
def test_main():
run_unittest(TracebackCases)

View File

@ -170,7 +170,7 @@ def format_exception_only(etype, value):
# would throw another exception and mask the original problem.
if (isinstance(etype, BaseException) or
isinstance(etype, types.InstanceType) or
type(etype) is str):
etype is None or type(etype) is str):
return [_format_final_exc_line(etype, value)]
stype = etype.__name__

View File

@ -56,6 +56,10 @@ Core and builtins
Library
-------
- Fix a bug in traceback.format_exception_only() that led to an error
being raised when print_exc() was called without an exception set.
In version 2.4, this printed "None", restored that behavior.
- Make webbrowser.BackgroundBrowser usable in Windows (it wasn't because
the close_fds arg to subprocess.Popen is not supported).