From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 29 Jan 2014 04:13:45 +0000 (-0500)
Subject: Idlelib: forward port changes that silenced 2.7 -3 deprecation warnings and
X-Git-Tag: v3.4.0rc1~200^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e40295af6be0e43e62a22300cbdfb62e28f237d;p=thirdparty%2FPython%2Fcpython.git

Idlelib: forward port changes that silenced 2.7 -3 deprecation warnings and
which are at least as efficient. On Py3, unpacking exceptions never works.
---

diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/Debugger.py
index ed66084e91c6..d4872ed42af8 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 bbd221dec224..9d3c4cb78a70 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