Merge branch 'main' into fix/replace-repeated-deepcopy-with-attribute…

…-lookup
googleapis · May 2, 2022 · 9cc0df0 · 9cc0df0
2 parents 37321e5 + 3148a1c
commit 9cc0df0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/proto/_package_info.py b/proto/_package_info.py
@@ -33,10 +33,11 @@ def compile(name, attrs):
     # Pull a reference to the module where this class is being
     # declared.
     module = sys.modules.get(attrs.get("__module__"))
+    module_name = module.__name__ if hasattr(module, __name__) else ""
     proto_module = getattr(module, "__protobuf__", object())
 
     # A package should be present; get the marshal from there.
-    package = getattr(proto_module, "package", "")
+    package = getattr(proto_module, "package", module_name)
     marshal = Marshal(name=getattr(proto_module, "marshal", package))
 
     # Done; return the data.