fix: dir(proto.Message) does not raise (#302)

dir(proto.Message) defaults to dir(type)
googleapis · Feb 17, 2022 · 80dcce9 · 80dcce9
1 parent 71591e1
commit 80dcce9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/proto/message.py b/proto/message.py
@@ -274,25 +274,28 @@ def meta(cls):
         return cls._meta
 
     def __dir__(self):
-        names = set(dir(type))
-        names.update(
-            (
-                "meta",
-                "pb",
-                "wrap",
-                "serialize",
-                "deserialize",
-                "to_json",
-                "from_json",
-                "to_dict",
-                "copy_from",
+        try:
+            names = set(dir(type))
+            names.update(
+                (
+                    "meta",
+                    "pb",
+                    "wrap",
+                    "serialize",
+                    "deserialize",
+                    "to_json",
+                    "from_json",
+                    "to_dict",
+                    "copy_from",
+                )
             )
-        )
-        desc = self.pb().DESCRIPTOR
-        names.update(t.name for t in desc.nested_types)
-        names.update(e.name for e in desc.enum_types)
+            desc = self.pb().DESCRIPTOR
+            names.update(t.name for t in desc.nested_types)
+            names.update(e.name for e in desc.enum_types)
 
-        return names
+            return names
+        except AttributeError:
+            return dir(type)
 
     def pb(cls, obj=None, *, coerce: bool = False):
         """Return the underlying protobuf Message class or instance.

diff --git a/tests/test_message.py b/tests/test_message.py
@@ -415,3 +415,7 @@ class Arm(proto.Message):
 
     actual = set(dir(Mollusc))
     assert actual == expected
+
+
+def test_dir_message_base():
+    assert set(dir(proto.Message)) == set(dir(type))