Commit 0679a73c authored by Skip Montanaro's avatar Skip Montanaro

remove unqualified excepts - catch ImportError when trying to import

readline and get rid of string exception fallback when showing syntax
errors.
see bug 411881
parent 0897f0c4
...@@ -133,12 +133,7 @@ class InteractiveInterpreter: ...@@ -133,12 +133,7 @@ class InteractiveInterpreter:
pass pass
else: else:
# Stuff in the right filename # Stuff in the right filename
try: value = SyntaxError(msg, (filename, lineno, offset, line))
# 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)
sys.last_value = value sys.last_value = value
list = traceback.format_exception_only(type, value) list = traceback.format_exception_only(type, value)
map(self.write, list) map(self.write, list)
...@@ -302,7 +297,7 @@ def interact(banner=None, readfunc=None, local=None): ...@@ -302,7 +297,7 @@ def interact(banner=None, readfunc=None, local=None):
else: else:
try: try:
import readline import readline
except: except ImportError:
pass pass
console.interact(banner) console.interact(banner)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment