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 b709e77

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 6877b31 commit b709e77
Copy full SHA for b709e77

File tree

Expand file treeCollapse file tree

1 file changed

+23
-12
lines changed
Filter options
  • packages/google-cloud-os-login/google/cloud/oslogin_v1
Expand file treeCollapse file tree

1 file changed

+23
-12
lines changed

‎packages/google-cloud-os-login/google/cloud/oslogin_v1/types.py

Copy file name to clipboardExpand all lines: packages/google-cloud-os-login/google/cloud/oslogin_v1/types.py
+23-12Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,35 @@
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.oslogin_v1.proto import common_pb2
22-
from google.cloud.oslogin_v1.proto import oslogin_pb2
2319
from google.protobuf import descriptor_pb2
2420
from google.protobuf import empty_pb2
2521
from google.protobuf import field_mask_pb2
2622

23+
from google.api_core.protobuf_helpers import get_messages
24+
from google.cloud.oslogin_v1.proto import common_pb2
25+
from google.cloud.oslogin_v1.proto import oslogin_pb2
26+
27+
_shared_modules = [
28+
http_pb2,
29+
descriptor_pb2,
30+
empty_pb2,
31+
field_mask_pb2,
32+
]
33+
34+
_local_modules = [
35+
common_pb2,
36+
oslogin_pb2,
37+
]
38+
2739
names = []
28-
for module in (
29-
http_pb2,
30-
common_pb2,
31-
oslogin_pb2,
32-
descriptor_pb2,
33-
empty_pb2,
34-
field_mask_pb2,
35-
):
40+
41+
for module in _shared_modules:
42+
for name, message in get_messages(module).items():
43+
setattr(sys.modules[__name__], name, message)
44+
names.append(name)
45+
46+
for module in _local_modules:
3647
for name, message in get_messages(module).items():
3748
message.__module__ = 'google.cloud.oslogin_v1.types'
3849
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.