From 8119c13fe482e3f16fa416c4da532ddd10f705a5 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Tue, 28 Jan 2014 23:13:35 -0500 Subject: [PATCH] Idlelib: silence two buildbot Deprecation Warnings with better code. --- Lib/idlelib/Debugger.py | 4 ++-- Lib/idlelib/SearchEngine.py | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/Debugger.py index 04eea3235b..b7d2652b31 100644 --- 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 ea6f1dede6..9517412477 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 @@ -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) -- 2.50.1