[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2
terry.reedy
python-checkins at python.org
Sun Feb 5 20:33:26 CET 2012
http://hg.python.org/cpython/rev/60beb14636b7
changeset: 74798:60beb14636b7
parent: 74795:773a97b3927d
parent: 74797:d8f988b0c959
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sun Feb 05 14:32:37 2012 -0500
summary:
Merge with 3.2
#13933 refine patch using 'new' builtin
files:
Lib/idlelib/AutoComplete.py | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Lib/idlelib/AutoComplete.py b/Lib/idlelib/AutoComplete.py
--- a/Lib/idlelib/AutoComplete.py
+++ b/Lib/idlelib/AutoComplete.py
@@ -190,8 +190,7 @@
bigl = eval("dir()", namespace)
bigl.sort()
if "__all__" in bigl:
- smalll = list(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 @@
bigl = dir(entity)
bigl.sort()
if "__all__" in bigl:
- smalll = list(entity.__all__)
- smalll.sort()
+ smalll = sorted(entity.__all__)
else:
smalll = [s for s in bigl if s[:1] != '_']
except:
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list