Add dir __base__ recursively; Add dir tests to 70_builtins.py

python/builtins.py

@@ -85,18 +85,18 @@ def dir(obj=None):
     if obj is None:
         return list(globals().keys())
     
-    if hasattr(obj, "__dir__"):
-        return obj.__dir__()
-    
     attributes = set()
-    # Set object attributes.
+    
+    if not isinstance(obj, type):
+        if hasattr(obj, "__dir__"):
+            return sorted(obj.__dir__())
+        attributes.update(dir(type(obj)))
+    
     if hasattr(obj, "__dict__"):
         attributes.update(obj.__dict__.keys())
     
-    # Set type attributes.
-    if not isinstance(obj, type):
-        if hasattr(type(obj), "__dict__"):
-            attributes.update(type(obj).__dict__.keys())
+    if hasattr(obj, "__base__") and obj.__base__ is not None:
+        attributes.update(dir(obj.__base__))
     
     return sorted(attributes)
 

tests/70_builtins.py

@@ -50,3 +50,20 @@ assert not all([False, False])
 
 assert list(enumerate([1,2,3])) == [(0,1), (1,2), (2,3)]
 assert list(enumerate([1,2,3], 1)) == [(1,1), (2,2), (3,3)]
+
+class C1:
+    def c(): ...
+
+class C2(C1):
+    a = 'a'
+    def __init__(self):
+        self.b = 1
+
+class C3:
+    def __dir__(self):
+        return ["custom"]
+
+assert "__name__" in dir()
+assert "a", "b" in dir(C2())
+assert "c" in dir(C2())
+assert ["custom"] == dir(C3())