[pypy-commit] pypy py3.3: merge py3k

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3.3
Changeset: r72677:7aed11f278e7
Date: 2014-08-03 11:25 -0700
http://bitbucket.org/pypy/pypy/changeset/7aed11f278e7/

Log:	merge py3k

diff --git a/pypy/module/__builtin__/app_inspect.py b/pypy/module/__builtin__/app_inspect.py
--- a/pypy/module/__builtin__/app_inspect.py
+++ b/pypy/module/__builtin__/app_inspect.py
@@ -39,9 +39,7 @@
     if len(args) > 1:
         raise TypeError("dir expected at most 1 arguments, got %d" % len(args))
     if len(args) == 0:
-        local_names = list(_caller_locals().keys()) # 2 stackframes away
-        local_names.sort()
-        return local_names
+        return sorted(_caller_locals().keys()) # 2 stackframes away
 
     obj = args[0]
     dir_meth = lookup_special(obj, '__dir__')