From 0679a73c0ec3ddf46f42b8c7d09d97730bd386cd Mon Sep 17 00:00:00 2001 From: Skip Montanaro Date: Mon, 25 Mar 2002 21:44:07 +0000 Subject: remove unqualified excepts - catch ImportError when trying to import readline and get rid of string exception fallback when showing syntax errors. see bug 411881 --- Lib/code.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'Lib/code.py') diff --git a/Lib/code.py b/Lib/code.py index ad42a9b1e6..64b7bc086b 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) -- cgit v1.2.1