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 4f38d22 commit df86806
Showing 1 changed file with 30 additions and 18 deletions.
48 changes: 30 additions & 18 deletions packages/google-cloud-dlp/google/cloud/dlp_v2/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +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.dlp_v2.proto import dlp_pb2
from google.cloud.dlp_v2.proto import storage_pb2
from google.protobuf import any_pb2
from google.protobuf import descriptor_pb2
from google.protobuf import duration_pb2
Expand All @@ -30,21 +26,37 @@
from google.type import date_pb2
from google.type import timeofday_pb2

from google.api_core.protobuf_helpers import get_messages
from google.cloud.dlp_v2.proto import dlp_pb2
from google.cloud.dlp_v2.proto import storage_pb2


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

_local_modules = [
dlp_pb2,
storage_pb2,
]

names = []
for module in (
http_pb2,
dlp_pb2,
storage_pb2,
any_pb2,
descriptor_pb2,
duration_pb2,
empty_pb2,
field_mask_pb2,
timestamp_pb2,
status_pb2,
date_pb2,
timeofday_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.dlp_v2.types'
setattr(sys.modules[__name__], name, message)
Expand Down

0 comments on commit df86806

Please sign in to comment.