Skip to content

Commit d37541b

Browse 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 2bab4fa commit d37541b

File tree

1 file changed

+35
-23
lines changed
  • packages/google-cloud-firestore/google/cloud/firestore_v1beta1

1 file changed

+35
-23
lines changed

packages/google-cloud-firestore/google/cloud/firestore_v1beta1/types.py

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +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.firestore_v1beta1.proto import common_pb2
22-
from google.cloud.firestore_v1beta1.proto import document_pb2
23-
from google.cloud.firestore_v1beta1.proto import firestore_pb2
24-
from google.cloud.firestore_v1beta1.proto import query_pb2
25-
from google.cloud.firestore_v1beta1.proto import write_pb2
2619
from google.protobuf import any_pb2
2720
from google.protobuf import descriptor_pb2
2821
from google.protobuf import empty_pb2
@@ -32,23 +25,42 @@
3225
from google.rpc import status_pb2
3326
from google.type import latlng_pb2
3427

28+
from google.api_core.protobuf_helpers import get_messages
29+
from google.cloud.firestore_v1beta1.proto import common_pb2
30+
from google.cloud.firestore_v1beta1.proto import document_pb2
31+
from google.cloud.firestore_v1beta1.proto import firestore_pb2
32+
from google.cloud.firestore_v1beta1.proto import query_pb2
33+
from google.cloud.firestore_v1beta1.proto import write_pb2
34+
35+
36+
_shared_modules = [
37+
http_pb2,
38+
any_pb2,
39+
descriptor_pb2,
40+
empty_pb2,
41+
struct_pb2,
42+
timestamp_pb2,
43+
wrappers_pb2,
44+
status_pb2,
45+
latlng_pb2,
46+
]
47+
48+
_local_modules = [
49+
common_pb2,
50+
document_pb2,
51+
firestore_pb2,
52+
query_pb2,
53+
write_pb2,
54+
]
55+
3556
names = []
36-
for module in (
37-
http_pb2,
38-
common_pb2,
39-
document_pb2,
40-
firestore_pb2,
41-
query_pb2,
42-
write_pb2,
43-
any_pb2,
44-
descriptor_pb2,
45-
empty_pb2,
46-
struct_pb2,
47-
timestamp_pb2,
48-
wrappers_pb2,
49-
status_pb2,
50-
latlng_pb2,
51-
):
57+
58+
for module in _shared_modules:
59+
for name, message in get_messages(module).items():
60+
setattr(sys.modules[__name__], name, message)
61+
names.append(name)
62+
63+
for module in _local_modules:
5264
for name, message in get_messages(module).items():
5365
message.__module__ = 'google.cloud.firestore_v1beta1.types'
5466
setattr(sys.modules[__name__], name, message)

0 commit comments

Comments
 (0)