Avoid overwriting '__module__' of messages from shared modules. (#5364)

Note that we *are* still overwriting it for messages from modules defined
within the current package.

See #4715.

packages/google-cloud-language/google/cloud/language_v1/types.py

@@ -15,17 +15,30 @@
 from __future__ import absolute_import
 import sys
 
-from google.api_core.protobuf_helpers import get_messages
-
 from google.api import http_pb2
-from google.cloud.language_v1.proto import language_service_pb2
 from google.protobuf import descriptor_pb2
 
+from google.api_core.protobuf_helpers import get_messages
+from google.cloud.language_v1.proto import language_service_pb2
+
+
+_shared_modules = [
+    http_pb2,
+    descriptor_pb2,
+]
+
+_local_modules = [
+    language_service_pb2,
+]
+
 names = []
-for module in (
-        http_pb2,
-        language_service_pb2,
-        descriptor_pb2, ):
+
+for module in _shared_modules:
+    for name, message in get_messages(module).items():
+        setattr(sys.modules[__name__], name, message)
+        names.append(name)
+
+for module in _local_modules:
     for name, message in get_messages(module).items():
         message.__module__ = 'google.cloud.language_v1.types'
         setattr(sys.modules[__name__], name, message)

packages/google-cloud-language/google/cloud/language_v1beta2/types.py

@@ -15,27 +15,40 @@
 from __future__ import absolute_import
 import sys
 
-from google.api_core.protobuf_helpers import get_messages
-
 from google.api import http_pb2
-from google.cloud.language_v1beta2.proto import language_service_pb2
 from google.longrunning import operations_pb2
 from google.protobuf import any_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf import empty_pb2
 from google.protobuf import timestamp_pb2
 from google.rpc import status_pb2
 
+from google.api_core.protobuf_helpers import get_messages
+from google.cloud.language_v1beta2.proto import language_service_pb2
+
+
+_shared_modules = [
+    http_pb2,
+    operations_pb2,
+    any_pb2,
+    descriptor_pb2,
+    empty_pb2,
+    timestamp_pb2,
+    status_pb2,
+]
+
+_local_modules = [
+    language_service_pb2,
+]
+
 names = []
-for module in (
-        http_pb2,
-        language_service_pb2,
-        operations_pb2,
-        any_pb2,
-        descriptor_pb2,
-        empty_pb2,
-        timestamp_pb2,
-        status_pb2, ):
+
+for module in _shared_modules:
+    for name, message in get_messages(module).items():
+        setattr(sys.modules[__name__], name, message)
+        names.append(name)
+
+for module in _local_modules:
     for name, message in get_messages(module).items():
         message.__module__ = 'google.cloud.language_v1beta2.types'
         setattr(sys.modules[__name__], name, message)