Skip to content

Commit

Permalink
Avoid overwriting '__module__' of messages from shared modules. (#5364)
Browse files Browse the repository at this point in the history
Note that we *are* still overwriting it for messages from modules defined
within the current package.

See #4715.
  • Loading branch information
tseaver authored May 22, 2018
1 parent b781324 commit 924efae
Showing 1 changed file with 49 additions and 37 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,21 @@
from __future__ import absolute_import
import sys

from google.api_core.protobuf_helpers import get_messages

from google.api import distribution_pb2
from google.api import http_pb2
from google.api import label_pb2
from google.api import metric_pb2 as api_metric_pb2
from google.api import monitored_resource_pb2
from google.protobuf import any_pb2
from google.protobuf import descriptor_pb2
from google.protobuf import duration_pb2
from google.protobuf import empty_pb2
from google.protobuf import field_mask_pb2
from google.protobuf import timestamp_pb2
from google.protobuf import wrappers_pb2
from google.rpc import status_pb2

from google.api_core.protobuf_helpers import get_messages
from google.cloud.monitoring_v3.proto import alert_pb2
from google.cloud.monitoring_v3.proto import alert_service_pb2
from google.cloud.monitoring_v3.proto import common_pb2
Expand All @@ -34,43 +42,47 @@
from google.cloud.monitoring_v3.proto import notification_service_pb2
from google.cloud.monitoring_v3.proto import uptime_pb2
from google.cloud.monitoring_v3.proto import uptime_service_pb2
from google.protobuf import any_pb2
from google.protobuf import descriptor_pb2
from google.protobuf import duration_pb2
from google.protobuf import empty_pb2
from google.protobuf import field_mask_pb2
from google.protobuf import timestamp_pb2
from google.protobuf import wrappers_pb2
from google.rpc import status_pb2


_shared_modules = [
distribution_pb2,
http_pb2,
label_pb2,
api_metric_pb2,
monitored_resource_pb2,
any_pb2,
descriptor_pb2,
duration_pb2,
empty_pb2,
field_mask_pb2,
timestamp_pb2,
wrappers_pb2,
status_pb2,
]

_local_modules = [
alert_pb2,
alert_service_pb2,
common_pb2,
group_pb2,
group_service_pb2,
proto_metric_pb2,
metric_service_pb2,
mutation_record_pb2,
notification_pb2,
notification_service_pb2,
uptime_pb2,
uptime_service_pb2,
]

names = []
for module in (
distribution_pb2,
http_pb2,
label_pb2,
api_metric_pb2,
monitored_resource_pb2,
alert_pb2,
alert_service_pb2,
common_pb2,
group_pb2,
group_service_pb2,
proto_metric_pb2,
metric_service_pb2,
mutation_record_pb2,
notification_pb2,
notification_service_pb2,
uptime_pb2,
uptime_service_pb2,
any_pb2,
descriptor_pb2,
duration_pb2,
empty_pb2,
field_mask_pb2,
timestamp_pb2,
wrappers_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.monitoring_v3.types'
setattr(sys.modules[__name__], name, message)
Expand Down

0 comments on commit 924efae

Please sign in to comment.