merge 3.2

This commit is contained in:
Martin v. Löwis 2012-06-03 12:33:23 +02:00
commit f20940792d
3 changed files with 3 additions and 3 deletions

View File

@ -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] == '.':

View File

@ -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

View File

@ -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.