[pypy-commit] pypy py3k: handle dict views in dir()

[pjenvey]

Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r48890:0e9d5f1f05c5
Date: 2011-11-07 14:25 -0800
http://bitbucket.org/pypy/pypy/changeset/0e9d5f1f05c5/

Log:    handle dict views in dir()

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
@@ -54,9 +54,7 @@
         raise TypeError("dir expected at most 1 arguments, got %d"
                         % len(args))
     if len(args) == 0:
-        local_names = _caller_locals().keys() # 2 stackframes away
-        if not isinstance(local_names, list):
-            raise TypeError("expected locals().keys() to be a list")
+        local_names = list(_caller_locals().keys()) # 2 stackframes away
         local_names.sort()
         return local_names
 
@@ -82,7 +80,7 @@
 
     elif isinstance(obj, type):
         #Don't look at __class__, as metaclass methods would be confusing.
-        result = _classdir(obj).keys()
+        result = list(_classdir(obj).keys())
         result.sort()
         return result
 
@@ -113,7 +111,7 @@
             except (AttributeError, TypeError):
                 pass
 
-        result = Dict.keys()
+        result = list(Dict.keys())
         result.sort()
         return result
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit