From 1e40295af6be0e43e62a22300cbdfb62e28f237d Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Tue, 28 Jan 2014 23:13:45 -0500 Subject: Idlelib: forward port changes that silenced 2.7 -3 deprecation warnings and which are at least as efficient. On Py3, unpacking exceptions never works. --- Lib/idlelib/Debugger.py | 3 +-- Lib/idlelib/SearchEngine.py | 8 +++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/Debugger.py index ed66084..d4872ed 100644 --- a/Lib/idlelib/Debugger.py +++ b/Lib/idlelib/Debugger.py @@ -254,8 +254,7 @@ class Debugger: self.sync_source_line() def show_frame(self, stackitem): - frame, lineno = stackitem - self.frame = frame + self.frame = stackitem[0] # lineno is stackitem[1] self.show_variables() localsviewer = None diff --git a/Lib/idlelib/SearchEngine.py b/Lib/idlelib/SearchEngine.py index bbd221d..9d3c4cb 100644 --- a/Lib/idlelib/SearchEngine.py +++ b/Lib/idlelib/SearchEngine.py @@ -83,11 +83,9 @@ class SearchEngine: try: prog = re.compile(pat, flags) except re.error as what: - try: - msg, col = what - except: - msg = str(what) - col = -1 + args = what.args + msg = args[0] + col = arg[1] if len(args) >= 2 else -1 self.report_error(pat, msg, col) return None return prog -- cgit v0.12