[Python-checkins] cpython (2.7): More idlelib cleanup inspired by pyflakes.

[terry.reedy]

http://hg.python.org/cpython/rev/6cbb97f039bd
changeset:   91517:6cbb97f039bd
branch:      2.7
parent:      91512:962c1fefc34a
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Jul 01 21:33:26 2014 -0400
summary:
  More idlelib cleanup inspired by pyflakes.

files:
  Lib/idlelib/SearchEngine.py            |  2 +-
  Lib/idlelib/StackViewer.py             |  4 ++--
  Lib/idlelib/idle_test/test_textview.py |  6 ++----
  3 files changed, 5 insertions(+), 7 deletions(-)


diff --git a/Lib/idlelib/SearchEngine.py b/Lib/idlelib/SearchEngine.py
--- a/Lib/idlelib/SearchEngine.py
+++ b/Lib/idlelib/SearchEngine.py
@@ -85,7 +85,7 @@
         except re.error as what:
             args = what.args
             msg = args[0]
-            col = arg[1] if len(args) >= 2 else -1
+            col = args[1] if len(args) >= 2 else -1
             self.report_error(pat, msg, col)
             return None
         return prog
diff --git a/Lib/idlelib/StackViewer.py b/Lib/idlelib/StackViewer.py
--- a/Lib/idlelib/StackViewer.py
+++ b/Lib/idlelib/StackViewer.py
@@ -131,8 +131,8 @@
     root.geometry("+%d+%d"%(x, y + 150))
     flist = PyShellFileList(root)
     try: # to obtain a traceback object
-        a
-    except:
+        intentional_name_error
+    except NameError:
         exc_type, exc_value, exc_tb = sys.exc_info()
 
     # inject stack trace to sys
diff --git a/Lib/idlelib/idle_test/test_textview.py b/Lib/idlelib/idle_test/test_textview.py
--- a/Lib/idlelib/idle_test/test_textview.py
+++ b/Lib/idlelib/idle_test/test_textview.py
@@ -3,7 +3,7 @@
 import unittest
 import os
 from test.test_support import requires
-from Tkinter import Tk, Text, TclError
+from Tkinter import Tk
 from idlelib import textView as tv
 from idlelib.idle_test.mock_idle import Func
 from idlelib.idle_test.mock_tk import Mbox
@@ -93,6 +93,4 @@
         self.assertIsNone(view)
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2, exit=False)
-    from idlelib.idle_test.htest import run
-    run(TextViewer)
+    unittest.main(verbosity=2)

-- 
Repository URL: http://hg.python.org/cpython