mirror of
https://github.com/python/cpython.git
synced 2025-08-22 17:55:18 +00:00
Issue #25590: Make rlcompleter only call getattr() once per attribute
Previously it was called another time via hasattr(), and both calls were made once for dir(f) and again for dir(f.__class__). This includes a backport of changing from a list to a set from revision 4dbb315fe667.
This commit is contained in:
parent
1bb651540e
commit
06622ead80
3 changed files with 26 additions and 7 deletions
|
@ -136,20 +136,23 @@ class Completer:
|
|||
return []
|
||||
|
||||
# get the content of the object, except __builtins__
|
||||
words = dir(thisobject)
|
||||
if "__builtins__" in words:
|
||||
words.remove("__builtins__")
|
||||
words = set(dir(thisobject))
|
||||
words.discard("__builtins__")
|
||||
|
||||
if hasattr(thisobject, '__class__'):
|
||||
words.append('__class__')
|
||||
words.extend(get_class_members(thisobject.__class__))
|
||||
words.add('__class__')
|
||||
words.update(get_class_members(thisobject.__class__))
|
||||
matches = []
|
||||
n = len(attr)
|
||||
for word in words:
|
||||
if word[:n] == attr and hasattr(thisobject, word):
|
||||
val = getattr(thisobject, word)
|
||||
if word[:n] == attr:
|
||||
try:
|
||||
val = getattr(thisobject, word)
|
||||
except Exception:
|
||||
continue # Exclude properties that are not set
|
||||
word = self._callable_postfix(val, "%s.%s" % (expr, word))
|
||||
matches.append(word)
|
||||
matches.sort()
|
||||
return matches
|
||||
|
||||
def get_class_members(klass):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue