summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib/AutoComplete.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-02-06 16:29:05 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-02-06 16:29:05 (GMT)
commit1f30575713a153d5b3c558de6068bdfe1dd1a3f4 (patch)
treedeba748b158af26912ed798fe46df5e3c67d979e /Lib/idlelib/AutoComplete.py
parent2f9c71bbbab6fb66cd4df16e30313ea975e1c46d (diff)
parentd531b295f26d7a0364f171d95b6abac873185a2f (diff)
downloadcpython-1f30575713a153d5b3c558de6068bdfe1dd1a3f4.zip
cpython-1f30575713a153d5b3c558de6068bdfe1dd1a3f4.tar.gz
cpython-1f30575713a153d5b3c558de6068bdfe1dd1a3f4.tar.bz2
merge heads
Diffstat (limited to 'Lib/idlelib/AutoComplete.py')
-rw-r--r--Lib/idlelib/AutoComplete.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/idlelib/AutoComplete.py b/Lib/idlelib/AutoComplete.py
index fa1733f..4e17325 100644
--- a/Lib/idlelib/AutoComplete.py
+++ b/Lib/idlelib/AutoComplete.py
@@ -190,8 +190,7 @@ class AutoComplete:
bigl = eval("dir()", namespace)
bigl.sort()
if "__all__" in bigl:
- smalll = eval("__all__", namespace)
- smalll.sort()
+ smalll = sorted(eval("__all__", namespace))
else:
smalll = [s for s in bigl if s[:1] != '_']
else:
@@ -200,8 +199,7 @@ class AutoComplete:
bigl = dir(entity)
bigl.sort()
if "__all__" in bigl:
- smalll = entity.__all__
- smalll.sort()
+ smalll = sorted(entity.__all__)
else:
smalll = [s for s in bigl if s[:1] != '_']
except: