remove unqualified excepts - catch ImportError when trying to import
readline and get rid of string exception fallback when showing syntax
errors.
see bug 411881
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 @@
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 @@
else:
try:
import readline
- except:
+ except ImportError:
pass
console.interact(banner)