diff options
| author | Skip Montanaro <skip@pobox.com> | 2002-03-25 21:44:07 (GMT) |
|---|---|---|
| committer | Skip Montanaro <skip@pobox.com> | 2002-03-25 21:44:07 (GMT) |
| commit | 0679a73c0ec3ddf46f42b8c7d09d97730bd386cd (patch) | |
| tree | bfdb4ee9c9ba8b543b6454d92ea0bc89f28706db /Lib/code.py | |
| parent | 0897f0c4f8034fa656cf2be3cda93bfb067d0a65 (diff) | |
| download | cpython-0679a73c0ec3ddf46f42b8c7d09d97730bd386cd.zip cpython-0679a73c0ec3ddf46f42b8c7d09d97730bd386cd.tar.gz cpython-0679a73c0ec3ddf46f42b8c7d09d97730bd386cd.tar.bz2 | |
remove unqualified excepts - catch ImportError when trying to import
readline and get rid of string exception fallback when showing syntax
errors.
see bug 411881
Diffstat (limited to 'Lib/code.py')
| -rw-r--r-- | Lib/code.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Lib/code.py b/Lib/code.py index ad42a9b..64b7bc0 100644 --- a/Lib/code.py +++ b/Lib/code.py @@ -133,12 +133,7 @@ class InteractiveInterpreter: pass else: # Stuff in the right filename - try: - # Assume SyntaxError is a class exception - value = SyntaxError(msg, (filename, lineno, offset, line)) - except: - # If that failed, assume SyntaxError is a string - value = msg, (filename, lineno, offset, line) + value = SyntaxError(msg, (filename, lineno, offset, line)) sys.last_value = value list = traceback.format_exception_only(type, value) map(self.write, list) @@ -302,7 +297,7 @@ def interact(banner=None, readfunc=None, local=None): else: try: import readline - except: + except ImportError: pass console.interact(banner) |