#18151 Merge from 3.3

diff --cc Lib/idlelib/GrepDialog.py
index 1d8d51b5932187e62245ec9ca630bfecb2ea9e6c,2e07312eaf8d175dbafc38a5f0b6c280f3e1def7..c0074e24f68ee100af321e8b8365e6ec441fae8f
--- 1/Lib/idlelib/GrepDialog.py
--- 2/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)