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 aed3c01 commit f16a487
Showing 1 changed file with 30 additions and 19 deletions.
49 changes: 30 additions & 19 deletions packages/google-cloud-dataproc/google/cloud/dataproc_v1/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@
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.dataproc_v1.proto import clusters_pb2
from google.cloud.dataproc_v1.proto import jobs_pb2
from google.cloud.dataproc_v1.proto import operations_pb2 as proto_operations_pb2
from google.longrunning import operations_pb2 as longrunning_operations_pb2
from google.protobuf import any_pb2
from google.protobuf import descriptor_pb2
Expand All @@ -30,21 +25,37 @@
from google.protobuf import timestamp_pb2
from google.rpc import status_pb2

from google.api_core.protobuf_helpers import get_messages
from google.cloud.dataproc_v1.proto import clusters_pb2
from google.cloud.dataproc_v1.proto import jobs_pb2
from google.cloud.dataproc_v1.proto import operations_pb2 as proto_operations_pb2

_shared_modules = [
http_pb2,
longrunning_operations_pb2,
any_pb2,
descriptor_pb2,
duration_pb2,
empty_pb2,
field_mask_pb2,
timestamp_pb2,
status_pb2,
]

_local_modules = [
clusters_pb2,
jobs_pb2,
proto_operations_pb2,
]

names = []
for module in (
http_pb2,
clusters_pb2,
jobs_pb2,
proto_operations_pb2,
longrunning_operations_pb2,
any_pb2,
descriptor_pb2,
duration_pb2,
empty_pb2,
field_mask_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.dataproc_v1.types'
setattr(sys.modules[__name__], name, message)
Expand Down

0 comments on commit f16a487

Please sign in to comment.