mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #25663: Merge rlcompleter fix from 3.5

Browse source
This commit is contained in:
Martin Panter 2015-11-24 00:19:10 +00:00
commit 450c988184
3 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/rlcompleter.py
View file

@ -103,9 +103,11 @@ class Completer:
"""
import keyword
matches = []
seen = {"__builtins__"}
n = len(text)
for word in keyword.kwlist:
if word[:n] == text:
seen.add(word)
if word in {'finally', 'try'}:
word = word + ':'
elif word not in {'False', 'None', 'True',
@ -113,9 +115,10 @@ class Completer:
'else'}:
word = word + ' '
matches.append(word)
for nspace in [builtins.__dict__, self.namespace]:
for nspace in [self.namespace, builtins.__dict__]:
for word, val in nspace.items():
if word[:n] == text and word != "__builtins__":
if word[:n] == text and word not in seen:
seen.add(word)
matches.append(self._callable_postfix(val, word))
return matches