Skip to content

Commit c82e6c8

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 27c58a4 commit c82e6c8

File tree

1 file changed

+29
-17
lines changed
  • google/cloud/errorreporting_v1beta1

1 file changed

+29
-17
lines changed

google/cloud/errorreporting_v1beta1/types.py

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,44 @@
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
2119
from google.api import label_pb2
2220
from google.api import monitored_resource_pb2
21+
from google.protobuf import descriptor_pb2
22+
from google.protobuf import duration_pb2
23+
from google.protobuf import timestamp_pb2
24+
25+
from google.api_core.protobuf_helpers import get_messages
2326
from google.cloud.errorreporting_v1beta1.proto import common_pb2
2427
from google.cloud.errorreporting_v1beta1.proto import error_group_service_pb2
2528
from google.cloud.errorreporting_v1beta1.proto import error_stats_service_pb2
2629
from google.cloud.errorreporting_v1beta1.proto import report_errors_service_pb2
27-
from google.protobuf import descriptor_pb2
28-
from google.protobuf import duration_pb2
29-
from google.protobuf import timestamp_pb2
30+
31+
32+
_shared_modules = [
33+
http_pb2,
34+
label_pb2,
35+
monitored_resource_pb2,
36+
report_errors_service_pb2,
37+
descriptor_pb2,
38+
duration_pb2,
39+
timestamp_pb2,
40+
]
41+
42+
_local_modules = [
43+
common_pb2,
44+
error_group_service_pb2,
45+
error_stats_service_pb2,
46+
]
3047

3148
names = []
32-
for module in (
33-
http_pb2,
34-
label_pb2,
35-
monitored_resource_pb2,
36-
common_pb2,
37-
error_group_service_pb2,
38-
error_stats_service_pb2,
39-
report_errors_service_pb2,
40-
descriptor_pb2,
41-
duration_pb2,
42-
timestamp_pb2,
43-
):
49+
50+
for module in _shared_modules:
51+
for name, message in get_messages(module).items():
52+
setattr(sys.modules[__name__], name, message)
53+
names.append(name)
54+
55+
for module in _local_modules:
4456
for name, message in get_messages(module).items():
4557
message.__module__ = 'google.cloud.errorreporting_v1beta1.types'
4658
setattr(sys.modules[__name__], name, message)

0 commit comments

Comments
 (0)