Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r47980:85551fcf1cf8
Date: 2011-10-12 02:18 +0200
http://bitbucket.org/pypy/pypy/changeset/85551fcf1cf8/
Log: fix test_descriptor
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
@@ -64,14 +64,7 @@
obj = args[0]
- dir_meth = None
- if isinstance(obj, types.InstanceType):
- try:
- dir_meth = getattr(obj, "__dir__")
- except AttributeError:
- pass
- else:
- dir_meth = lookup_special(obj, "__dir__")
+ dir_meth = lookup_special(obj, "__dir__")
if dir_meth is not None:
result = dir_meth()
if not isinstance(result, list):
@@ -87,7 +80,7 @@
except AttributeError:
return []
- elif isinstance(obj, (types.TypeType, types.ClassType)):
+ elif isinstance(obj, type):
#Don't look at __class__, as metaclass methods would be confusing.
result = _classdir(obj).keys()
result.sort()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
