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

bpo-43146: fix None-handling in single-arg traceback.print_exception(None) (GH-24629)

Browse source 
(The previous commit fixed print_exception(None, None, None).)
This commit is contained in:
Irit Katriel 2021-02-23 17:43:04 +00:00 • committed by GitHub
parent 26f18b8540
commit b798ab0693
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_traceback.py
View file

@ -234,6 +234,10 @@ class TracebackCases(unittest.TestCase):
def test_exception_is_None(self): def test_exception_is_None(self):
NONE_EXC_STRING = 'NoneType: None\n' NONE_EXC_STRING = 'NoneType: None\n'
excfile = StringIO()
traceback.print_exception(None, file=excfile)
self.assertEqual(excfile.getvalue(), NONE_EXC_STRING)
excfile = StringIO() excfile = StringIO()
traceback.print_exception(None, None, None, file=excfile) traceback.print_exception(None, None, None, file=excfile)
self.assertEqual(excfile.getvalue(), NONE_EXC_STRING) self.assertEqual(excfile.getvalue(), NONE_EXC_STRING)
@ -243,6 +247,7 @@ class TracebackCases(unittest.TestCase):
self.assertEqual(excfile.getvalue(), NONE_EXC_STRING) self.assertEqual(excfile.getvalue(), NONE_EXC_STRING)
self.assertEqual(traceback.format_exc(None), NONE_EXC_STRING) self.assertEqual(traceback.format_exc(None), NONE_EXC_STRING)
self.assertEqual(traceback.format_exception(None), [NONE_EXC_STRING])
self.assertEqual( self.assertEqual(
traceback.format_exception(None, None, None), [NONE_EXC_STRING]) traceback.format_exception(None, None, None), [NONE_EXC_STRING])
self.assertEqual( self.assertEqual(

3
Lib/traceback.py
View file

@ -91,7 +91,10 @@ def _parse_value_tb(exc, value, tb):
if (value is _sentinel) != (tb is _sentinel): if (value is _sentinel) != (tb is _sentinel):
raise ValueError("Both or neither of value and tb must be given") raise ValueError("Both or neither of value and tb must be given")
if value is tb is _sentinel: if value is tb is _sentinel:
if exc is not None:
return exc, exc.__traceback__ return exc, exc.__traceback__
else:
return None, None
return value, tb return value, tb

1
Misc/NEWS.d/next/Library/2021-02-23-17-20-16.bpo-43146.JAFplg.rst Normal file
View file

@ -0,0 +1 @@
Handle None in single-arg versions of :func:`~traceback.print_exception` and :func:`~traceback.format_exception`.