diff options
| author | Guido van Rossum <guido@python.org> | 2006-05-02 17:36:09 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-05-02 17:36:09 (GMT) |
| commit | 8f6cbe150228f175b57b7a774d0a630febe72244 (patch) | |
| tree | bba118613b94595c6796db19a046000d45913037 | |
| parent | a883701dff079948f1f74cbbabb4d88a63794d2b (diff) | |
| download | cpython-8f6cbe150228f175b57b7a774d0a630febe72244.zip cpython-8f6cbe150228f175b57b7a774d0a630febe72244.tar.gz cpython-8f6cbe150228f175b57b7a774d0a630febe72244.tar.bz2 | |
Fix the formatting of KeyboardInterrupt -- a bad issubclass() call.
| -rw-r--r-- | Lib/test/test_traceback.py | 6 | ||||
| -rw-r--r-- | Lib/traceback.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py index 22c0456..1b59f98 100644 --- a/Lib/test/test_traceback.py +++ b/Lib/test/test_traceback.py @@ -103,6 +103,12 @@ def test(): import sys sys.exc_traceback.__members__ + def test_base_exception(self): + # Test that exceptions derived from BaseException are formatted right + e = KeyboardInterrupt() + lst = traceback.format_exception_only(e.__class__, e) + self.assertEqual(lst, ['KeyboardInterrupt\n']) + def test_main(): run_unittest(TracebackCases) diff --git a/Lib/traceback.py b/Lib/traceback.py index 454eb1b..d900f52 100644 --- a/Lib/traceback.py +++ b/Lib/traceback.py @@ -158,7 +158,7 @@ def format_exception_only(etype, value): """ list = [] if (type(etype) == types.ClassType - or (isinstance(etype, type) and issubclass(etype, Exception))): + or (isinstance(etype, type) and issubclass(etype, BaseException))): stype = etype.__name__ else: stype = etype |