summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2012-02-04 18:38:10 +0100
committerNed Deily <nad@acm.org>2012-02-04 18:38:10 +0100
commit08d052ac5aeef434b9ddbe70f96ae9dcc40a5c35 (patch)
tree9a26b9a8c1779a7ef25f8d1d38b953db9d9f2a9d
parent672b3ac2f098374217935d207fa8df77390fc9fb (diff)
parented3b867f330c107ed77044cffb4b28703aa17d08 (diff)
downloadcpython-git-08d052ac5aeef434b9ddbe70f96ae9dcc40a5c35.tar.gz
Issue #13933: merge
-rw-r--r--Lib/idlelib/AutoComplete.py4
-rw-r--r--Misc/NEWS3
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/idlelib/AutoComplete.py b/Lib/idlelib/AutoComplete.py
index fa1733f9a6..519099033f 100644
--- a/Lib/idlelib/AutoComplete.py
+++ b/Lib/idlelib/AutoComplete.py
@@ -190,7 +190,7 @@ class AutoComplete:
bigl = eval("dir()", namespace)
bigl.sort()
if "__all__" in bigl:
- smalll = eval("__all__", namespace)
+ smalll = list(eval("__all__", namespace))
smalll.sort()
else:
smalll = [s for s in bigl if s[:1] != '_']
@@ -200,7 +200,7 @@ class AutoComplete:
bigl = dir(entity)
bigl.sort()
if "__all__" in bigl:
- smalll = entity.__all__
+ smalll = list(entity.__all__)
smalll.sort()
else:
smalll = [s for s in bigl if s[:1] != '_']
diff --git a/Misc/NEWS b/Misc/NEWS
index 72a943d62a..b553b8ad9c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -466,6 +466,9 @@ Core and Builtins
Library
-------
+- Issue #13933: IDLE auto-complete did not work with some imported
+ module, like hashlib. (Patch by Roger Serwy)
+
- Issue #13901: Prevent test_distutils failures on OS X with --enable-shared.
- Issue #13676: Handle strings with embedded zeros correctly in sqlite3.