summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2012-06-03 10:33:23 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2012-06-03 10:33:23 (GMT)
commitf20940792df1f3b1dbda3ec5fdd6a8b6bc9f96d5 (patch)
tree6d90e2db588d354936773ef9807ea6d030597d52
parent428d161b577118c3160839d659a3b0b4afd577e2 (diff)
parent9f44a66abc476a6aa57238c005253242b45f827e (diff)
downloadcpython-f20940792df1f3b1dbda3ec5fdd6a8b6bc9f96d5.zip
cpython-f20940792df1f3b1dbda3ec5fdd6a8b6bc9f96d5.tar.gz
cpython-f20940792df1f3b1dbda3ec5fdd6a8b6bc9f96d5.tar.bz2
merge 3.2
-rw-r--r--Lib/idlelib/AutoComplete.py2
-rw-r--r--Lib/idlelib/AutoCompleteWindow.py2
-rw-r--r--Lib/idlelib/NEWS.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/idlelib/AutoComplete.py b/Lib/idlelib/AutoComplete.py
index a9518a3..b38b108 100644
--- a/Lib/idlelib/AutoComplete.py
+++ b/Lib/idlelib/AutoComplete.py
@@ -140,7 +140,7 @@ class AutoComplete:
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
index 0477746..7787e70 100644
--- a/Lib/idlelib/AutoCompleteWindow.py
+++ b/Lib/idlelib/AutoCompleteWindow.py
@@ -354,7 +354,7 @@ class AutoCompleteWindow:
# 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
index 7ea53db..29398e2 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -2,7 +2,7 @@ What's New in IDLE 3.3.0?
=========================
- 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.