Skip to content

Commit d40d733

Browse files
authored
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.
1 parent a9223b2 commit d40d733

File tree

1 file changed

+21
-9
lines changed
  • packages/google-cloud-container/google/cloud/container_v1

1 file changed

+21
-9
lines changed

packages/google-cloud-container/google/cloud/container_v1/types.py

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,32 @@
1515
from __future__ import absolute_import
1616
import sys
1717

18-
from google.api_core.protobuf_helpers import get_messages
19-
2018
from google.api import http_pb2
21-
from google.cloud.container_v1.proto import cluster_service_pb2
2219
from google.protobuf import descriptor_pb2
2320
from google.protobuf import empty_pb2
2421

22+
from google.api_core.protobuf_helpers import get_messages
23+
from google.cloud.container_v1.proto import cluster_service_pb2
24+
25+
26+
_shared_modules = [
27+
http_pb2,
28+
descriptor_pb2,
29+
empty_pb2,
30+
]
31+
32+
_local_modules = [
33+
cluster_service_pb2,
34+
]
35+
2536
names = []
26-
for module in (
27-
http_pb2,
28-
cluster_service_pb2,
29-
descriptor_pb2,
30-
empty_pb2,
31-
):
37+
38+
for module in _shared_modules:
39+
for name, message in get_messages(module).items():
40+
setattr(sys.modules[__name__], name, message)
41+
names.append(name)
42+
43+
for module in _local_modules:
3244
for name, message in get_messages(module).items():
3345
message.__module__ = 'google.cloud.container_v1.types'
3446
setattr(sys.modules[__name__], name, message)

0 commit comments

Comments
 (0)