Idlelib: silence two buildbot Deprecation Warnings with better code.

diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/Debugger.py
index 04eea3235b6797169a551d079ae2aef2f482f46a..b7d2652b31ea4a52cee715bc159321c2b5716b20 100644 (file)
--- a/Lib/idlelib/Debugger.py
+++ b/Lib/idlelib/Debugger.py
@@ -253,8 +253,8 @@ class Debugger:
         if self.vsource.get():
             self.sync_source_line()
 
-    def show_frame(self, (frame, lineno)):
-        self.frame = frame
+    def show_frame(self, stackitem):
+        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 ea6f1dede69b3c04b5fa6e499f047250387d39b1..9517412477d1fe653f3e33bde2e3c3c195e90c99 100644 (file)
--- 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
@@ -231,6 +229,6 @@ def get_line_col(index):
     return line, col
 
 if __name__ == "__main__":
-    from test import support; support.use_resources = ['gui']
+    from test import test_support; test_support.use_resources = ['gui']
     import unittest
     unittest.main('idlelib.idle_test.test_searchengine', verbosity=2, exit=False)