From 1e40295af6be0e43e62a22300cbdfb62e28f237d Mon Sep 17 00:00:00 2001
From: Terry Jan Reedy <tjreedy@udel.edu>
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/SearchEngine.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'Lib/idlelib/SearchEngine.py')

diff --git a/Lib/idlelib/SearchEngine.py b/Lib/idlelib/SearchEngine.py
index bbd221dec2..9d3c4cb78a 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 v1.2.1