summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-03-06 07:46:26 +0000
committerGeorg Brandl <georg@python.org>2008-03-06 07:46:26 +0000
commitab61dce0e11a2160537a865afd50fdf48aa596dd (patch)
tree8bd38755a59651502f5a5ff8e44fed10bc1050a2
parent0e305557482aa3c35140c7d719e9f982e00a2270 (diff)
downloadcpython-git-ab61dce0e11a2160537a865afd50fdf48aa596dd.tar.gz
Bug #2220: handle rlcompleter attribute match failure more gracefully.
(backport from r61275)
-rw-r--r--Lib/rlcompleter.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/rlcompleter.py b/Lib/rlcompleter.py
index dab0cb9eaa..a2d5fe6a8f 100644
--- a/Lib/rlcompleter.py
+++ b/Lib/rlcompleter.py
@@ -125,7 +125,7 @@ class Completer:
import re
m = re.match(r"(\w+(\.\w+)*)\.(\w*)", text)
if not m:
- return
+ return []
expr, attr = m.group(1, 3)
object = eval(expr, self.namespace)
words = dir(object)
diff --git a/Misc/NEWS b/Misc/NEWS
index 6af11b1475..43bc504b82 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,8 @@ Core and builtins
Library
-------
+- Bug #2220: handle rlcompleter attribute match failure more gracefully.
+
- Bug #1725737: In distutil's sdist, exclude RCS, CVS etc. also in the
root directory, and also exclude .hg, .git, .bzr, and _darcs.