[Python-checkins] cpython (merge 3.3 -> default): #17511: merge with 3.3.

[roger.serwy]

http://hg.python.org/cpython/rev/67714c4d9725
changeset:   84087:67714c4d9725
parent:      84084:668aba845fb2
parent:      84086:dac11f143581
user:        Roger Serwy <roger.serwy at gmail.com>
date:        Mon Jun 10 23:02:56 2013 -0500
summary:
  #17511: merge with 3.3.

files:
  Lib/idlelib/SearchDialog.py |  5 ++---
  Misc/ACKS                   |  1 +
  Misc/NEWS                   |  3 +++
  3 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Lib/idlelib/SearchDialog.py b/Lib/idlelib/SearchDialog.py
--- a/Lib/idlelib/SearchDialog.py
+++ b/Lib/idlelib/SearchDialog.py
@@ -24,13 +24,12 @@
 
     def create_widgets(self):
         f = SearchDialogBase.create_widgets(self)
-        self.make_button("Find", self.default_command, 1)
+        self.make_button("Find Next", self.default_command, 1)
 
     def default_command(self, event=None):
         if not self.engine.getprog():
             return
-        if self.find_again(self.text):
-            self.close()
+        self.find_again(self.text)
 
     def find_again(self, text):
         if not self.engine.getpat():
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -617,6 +617,7 @@
 Sijin Joseph
 Andreas Jung
 Tattoo Mabonzo K.
+Sarah K.
 Bohuslav Kabrda
 Alexey Kachayev
 Bob Kahn
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -453,6 +453,9 @@
 IDLE
 ----
 
+- Issue #17511: Keep IDLE find dialog open after clicking "Find Next".
+  Original patch by Sarah K.
+
 - Issue #18055: Move IDLE off of imp and on to importlib.
 
 - Issue #15392: Create a unittest framework for IDLE.

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