[Python-checkins] cpython: Issue #25590: Complete attribute names even if they are not yet created
martin.panter
python-checkins at python.org
Fri Nov 13 18:57:39 EST 2015
https://hg.python.org/cpython/rev/bbf63749a129
changeset: 99118:bbf63749a129
user: Martin Panter <vadmium+py at gmail.com>
date: Fri Nov 13 23:54:02 2015 +0000
summary:
Issue #25590: Complete attribute names even if they are not yet created
files:
Doc/whatsnew/3.6.rst | 4 ++++
Lib/rlcompleter.py | 8 +++++---
Lib/test/test_rlcompleter.py | 8 ++++++++
Misc/NEWS | 4 ++++
4 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -120,6 +120,10 @@
with underscores. A space or a colon can be added after completed keyword.
(Contributed by Serhiy Storchaka in :issue:`25011` and :issue:`25209`.)
+Names of most attributes listed by :func:`dir` are now completed.
+Previously, names of properties and slots which were not yet created on
+an instance were excluded. (Contributed by Martin Panter in :issue:`25590`.)
+
urllib.robotparser
------------------
diff --git a/Lib/rlcompleter.py b/Lib/rlcompleter.py
--- a/Lib/rlcompleter.py
+++ b/Lib/rlcompleter.py
@@ -160,12 +160,14 @@
for word in words:
if (word[:n] == attr and
not (noprefix and word[:n+1] == noprefix)):
+ match = "%s.%s" % (expr, word)
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)
+ pass # Include even if attribute not set
+ else:
+ match = self._callable_postfix(val, match)
+ matches.append(match)
if matches or not noprefix:
break
if noprefix == '_':
diff --git a/Lib/test/test_rlcompleter.py b/Lib/test/test_rlcompleter.py
--- a/Lib/test/test_rlcompleter.py
+++ b/Lib/test/test_rlcompleter.py
@@ -92,6 +92,14 @@
self.assertEqual(completer.complete('f.b', 0), 'f.bar')
self.assertEqual(f.calls, 1)
+ def test_uncreated_attr(self):
+ # Attributes like properties and slots should be completed even when
+ # they haven't been created on an instance
+ class Foo:
+ __slots__ = ("bar",)
+ completer = rlcompleter.Completer(dict(f=Foo()))
+ self.assertEqual(completer.complete('f.', 0), 'f.bar')
+
def test_complete(self):
completer = rlcompleter.Completer()
self.assertEqual(completer.complete('', 0), '\t')
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -85,6 +85,10 @@
Library
-------
+- Issue #25590: In the Readline completer, only call getattr() once per
+ attribute. Also complete names of attributes such as properties and slots
+ which are listed by dir() but not yet created on an instance.
+
- Issue #25498: Fix a crash when garbage-collecting ctypes objects created
by wrapping a memoryview. This was a regression made in 3.5a1. Based
on patch by Eryksun.
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list