From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 22 Jun 2013 22:37:34 +0000 (-0400)
Subject: #18151 Merge from 3.3
X-Git-Tag: v3.4.0a1~425
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b54b0ca02ab556392af315f8cff10fb477ba6928;p=thirdparty%2FPython%2Fcpython.git

#18151 Merge from 3.3
---

b54b0ca02ab556392af315f8cff10fb477ba6928
diff --cc Lib/idlelib/GrepDialog.py
index 1d8d51b59321,2e07312eaf8d..c0074e24f68e
--- a/Lib/idlelib/GrepDialog.py
+++ b/Lib/idlelib/GrepDialog.py
@@@ -131,3 -119,10 +119,9 @@@ class GrepDialog(SearchDialogBase)
          if self.top:
              self.top.grab_release()
              self.top.withdraw()
+ 
+ if __name__ == "__main__":
+     # A human test is a bit tricky since EditorWindow() imports this module.
+     # Hence Idle must be restarted after editing this file for a live test.
+     import unittest
+     unittest.main('idlelib.idle_test.test_grep', verbosity=2, exit=False)
 -