[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[martin.v.loewis]

http://hg.python.org/cpython/rev/0c68d3412ee5
changeset:   77327:0c68d3412ee5
parent:      77324:8c07769d717e
parent:      77326:21a475aee5e0
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Sun Jun 03 12:33:23 2012 +0200
summary:
  merge 3.2

files:
  Lib/idlelib/AutoComplete.py       |  2 +-
  Lib/idlelib/AutoCompleteWindow.py |  2 +-
  Lib/idlelib/NEWS.txt              |  2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/idlelib/AutoComplete.py b/Lib/idlelib/AutoComplete.py
--- a/Lib/idlelib/AutoComplete.py
+++ b/Lib/idlelib/AutoComplete.py
@@ -140,7 +140,7 @@
         elif hp.is_in_code() and (not mode or mode==COMPLETE_ATTRIBUTES):
             self._remove_autocomplete_window()
             mode = COMPLETE_ATTRIBUTES
-            while i and curline[i-1] in ID_CHARS:
+            while i and curline[i-1] in ID_CHARS or ord(curline[i-1]) > 127:
                 i -= 1
             comp_start = curline[i:j]
             if i and curline[i-1] == '.':
diff --git a/Lib/idlelib/AutoCompleteWindow.py b/Lib/idlelib/AutoCompleteWindow.py
--- a/Lib/idlelib/AutoCompleteWindow.py
+++ b/Lib/idlelib/AutoCompleteWindow.py
@@ -354,7 +354,7 @@
             # A modifier key, so ignore
             return
 
-        elif event.char:
+        elif event.char and event.char >= ' ':
             # Regular character with a non-length-1 keycode
             self._change_start(self.start + event.char)
             self.lasttypedstart = self.start
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -2,7 +2,7 @@
 =========================
 
 - Issue #14937: Perform auto-completion of filenames in strings even for
-  non-ASCII filenames.
+  non-ASCII filenames. Likewise for identifiers.
 
 - Issue #8515: Set __file__ when run file in IDLE.
   Initial patch by Bruce Frederiksen.

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