1. Avoid hang when encountering a duplicate in a completion list. Bug 1571112.

2. Duplicate some old entries from Python's NEWS to IDLE's NEWS.txt
Backport of r53042

diff --git a/Lib/idlelib/AutoCompleteWindow.py b/Lib/idlelib/AutoCompleteWindow.py
index d8bbff4a17db9d835c5c3c9f2614239dddeddfba..d02a69539aede838690586b085674059194efc5b 100644 (file)
--- a/Lib/idlelib/AutoCompleteWindow.py
+++ b/Lib/idlelib/AutoCompleteWindow.py
@@ -118,8 +118,11 @@ class AutoCompleteWindow:
             i = 0
             while i < len(lts) and i < len(selstart) and lts[i] == selstart[i]:
                 i += 1
-            while cursel > 0 and selstart[:i] <= self.completions[cursel-1]:
+            previous_completion = self.completions[cursel - 1]
+            while cursel > 0 and selstart[:i] <= previous_completion:
                 i += 1
+                if selstart == previous_completion:
+                    break  # maybe we have a duplicate?
             newstart = selstart[:i]
         self._change_start(newstart)
 

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 178aee4710e2ab31b0a4a52a99f5a28b78451599..5e94c377b40be732938851bfecd12ce35d446d48 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,11 +3,14 @@ What's New in IDLE 1.2.2c1?
 
 *Release date: XX-FEB-2008*
 
+- Avoid hang when encountering a duplicate in a completion list. Bug 1571112.
+  (backport r53042)
+
 - Some syntax errors were being caught by tokenize during the tabnanny        
   check, resulting in obscure error messages.  Do the syntax check            
   first.  Bug 1562716, 1562719  (backport r52083)
 
-- Patch 1693258: Fix for duplicate "preferences" menu-OS X. Backport of r56204.
+- Patch 1693258: Fix for duplicate "preferences" menu-OS X. (backport r56204)
 
 - OSX: Avoid crash for those versions of Tcl/Tk which don't have a console
 
@@ -70,6 +73,13 @@ What's New in IDLE 1.2b3?
 
 *Release date: 03-AUG-2006*
 
+- Bug #1525817: Don't truncate short lines in IDLE's tool tips.
+
+- Bug #1517990: IDLE keybindings on MacOS X now work correctly
+
+- Bug #1517996: IDLE no longer shows the default Tk menu when a
+  path browser, class browser or debugger is the frontmost window on MacOS X
+
 - EditorWindow.test() was failing.  Bug 1417598
 
 - EditorWindow failed when used stand-alone if sys.ps1 not set.
@@ -106,6 +116,8 @@ What's New in IDLE 1.2a1?
 
 *Release date: 05-APR-2006*
 
+- Patch #1162825: Support non-ASCII characters in IDLE window titles.
+
 - Source file f.flush() after writing; trying to avoid lossage if user
   kills GUI.