Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit df86806

Browse filesBrowse 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 4f38d22 commit df86806
Copy full SHA for df86806

File tree

Expand file treeCollapse file tree

1 file changed

+30
-18
lines changed
Filter options
  • packages/google-cloud-dlp/google/cloud/dlp_v2
Expand file treeCollapse file tree

1 file changed

+30
-18
lines changed

‎packages/google-cloud-dlp/google/cloud/dlp_v2/types.py

Copy file name to clipboardExpand all lines: packages/google-cloud-dlp/google/cloud/dlp_v2/types.py
+30-18Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
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.dlp_v2.proto import dlp_pb2
22-
from google.cloud.dlp_v2.proto import storage_pb2
2319
from google.protobuf import any_pb2
2420
from google.protobuf import descriptor_pb2
2521
from google.protobuf import duration_pb2
@@ -30,21 +26,37 @@
3026
from google.type import date_pb2
3127
from google.type import timeofday_pb2
3228

29+
from google.api_core.protobuf_helpers import get_messages
30+
from google.cloud.dlp_v2.proto import dlp_pb2
31+
from google.cloud.dlp_v2.proto import storage_pb2
32+
33+
34+
_shared_modules = [
35+
http_pb2,
36+
any_pb2,
37+
descriptor_pb2,
38+
duration_pb2,
39+
empty_pb2,
40+
field_mask_pb2,
41+
timestamp_pb2,
42+
status_pb2,
43+
date_pb2,
44+
timeofday_pb2,
45+
]
46+
47+
_local_modules = [
48+
dlp_pb2,
49+
storage_pb2,
50+
]
51+
3352
names = []
34-
for module in (
35-
http_pb2,
36-
dlp_pb2,
37-
storage_pb2,
38-
any_pb2,
39-
descriptor_pb2,
40-
duration_pb2,
41-
empty_pb2,
42-
field_mask_pb2,
43-
timestamp_pb2,
44-
status_pb2,
45-
date_pb2,
46-
timeofday_pb2,
47-
):
53+
54+
for module in _shared_modules:
55+
for name, message in get_messages(module).items():
56+
setattr(sys.modules[__name__], name, message)
57+
names.append(name)
58+
59+
for module in _local_modules:
4860
for name, message in get_messages(module).items():
4961
message.__module__ = 'google.cloud.dlp_v2.types'
5062
setattr(sys.modules[__name__], name, message)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.