Skip to content

Commit e592ca3

Browse files
tseavertseaver
authored
Avoid overwriting '__module__' of messages from shared modules. (googleapis#5364)
Note that we *are* still overwriting it for messages from modules defined within the current package. See googleapis#4715.
1 parent 47926cd commit e592ca3

File tree

33 files changed

+957
-563
lines changed

33 files changed

+957
-563
lines changed

‎bigquery_datatransfer/google/cloud/bigquery_datatransfer_v1/types.py‎

Lines changed: 31 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.bigquery_datatransfer_v1.proto import datatransfer_pb2
22-
from google.cloud.bigquery_datatransfer_v1.proto import transfer_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,38 @@
3026
from google.protobuf import wrappers_pb2
3127
from google.rpc import status_pb2
3228

29+
from google.api_core.protobuf_helpers import get_messages
30+
from google.cloud.bigquery_datatransfer_v1.proto import datatransfer_pb2
31+
from google.cloud.bigquery_datatransfer_v1.proto import transfer_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+
struct_pb2,
42+
timestamp_pb2,
43+
wrappers_pb2,
44+
status_pb2,
45+
]
46+
47+
48+
_local_modules = [
49+
datatransfer_pb2,
50+
transfer_pb2,
51+
]
52+
3353
names = []
34-
for module in (
35-
http_pb2,
36-
datatransfer_pb2,
37-
transfer_pb2,
38-
any_pb2,
39-
descriptor_pb2,
40-
duration_pb2,
41-
empty_pb2,
42-
field_mask_pb2,
43-
struct_pb2,
44-
timestamp_pb2,
45-
wrappers_pb2,
46-
status_pb2,
47-
):
54+
55+
for module in _shared_modules:
56+
for name, message in get_messages(module).items():
57+
setattr(sys.modules[__name__], name, message)
58+
names.append(name)
59+
60+
for module in _local_modules:
4861
for name, message in get_messages(module).items():
4962
message.__module__ = 'google.cloud.bigquery_datatransfer_v1.types'
5063
setattr(sys.modules[__name__], name, message)

‎bigtable/google/cloud/bigtable_admin_v2/types.py‎

Lines changed: 36 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +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.bigtable_admin_v2.proto import bigtable_instance_admin_pb2
22-
from google.cloud.bigtable_admin_v2.proto import bigtable_table_admin_pb2
23-
from google.cloud.bigtable_admin_v2.proto import instance_pb2
24-
from google.cloud.bigtable_admin_v2.proto import table_pb2
2519
from google.iam.v1 import iam_policy_pb2
2620
from google.iam.v1 import policy_pb2
2721
from google.iam.v1.logging import audit_data_pb2
@@ -34,25 +28,43 @@
3428
from google.protobuf import timestamp_pb2
3529
from google.rpc import status_pb2
3630

31+
from google.api_core.protobuf_helpers import get_messages
32+
from google.cloud.bigtable_admin_v2.proto import bigtable_instance_admin_pb2
33+
from google.cloud.bigtable_admin_v2.proto import bigtable_table_admin_pb2
34+
from google.cloud.bigtable_admin_v2.proto import instance_pb2
35+
from google.cloud.bigtable_admin_v2.proto import table_pb2
36+
37+
38+
_shared_modules = [
39+
http_pb2,
40+
iam_policy_pb2,
41+
policy_pb2,
42+
audit_data_pb2,
43+
operations_pb2,
44+
any_pb2,
45+
descriptor_pb2,
46+
duration_pb2,
47+
empty_pb2,
48+
field_mask_pb2,
49+
timestamp_pb2,
50+
status_pb2,
51+
]
52+
53+
_local_modules = [
54+
bigtable_instance_admin_pb2,
55+
bigtable_table_admin_pb2,
56+
instance_pb2,
57+
table_pb2,
58+
]
59+
3760
names = []
38-
for module in (
39-
http_pb2,
40-
bigtable_instance_admin_pb2,
41-
bigtable_table_admin_pb2,
42-
instance_pb2,
43-
table_pb2,
44-
iam_policy_pb2,
45-
policy_pb2,
46-
audit_data_pb2,
47-
operations_pb2,
48-
any_pb2,
49-
descriptor_pb2,
50-
duration_pb2,
51-
empty_pb2,
52-
field_mask_pb2,
53-
timestamp_pb2,
54-
status_pb2,
55-
):
61+
62+
for module in _shared_modules:
63+
for name, message in get_messages(module).items():
64+
setattr(sys.modules[__name__], name, message)
65+
names.append(name)
66+
67+
for module in _local_modules:
5668
for name, message in get_messages(module).items():
5769
message.__module__ = 'google.cloud.bigtable_admin_v2.types'
5870
setattr(sys.modules[__name__], name, message)

‎bigtable/google/cloud/bigtable_v2/types.py‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,38 @@
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.bigtable_v2.proto import bigtable_pb2
22-
from google.cloud.bigtable_v2.proto import data_pb2
2319
from google.protobuf import any_pb2
2420
from google.protobuf import descriptor_pb2
2521
from google.protobuf import wrappers_pb2
2622
from google.rpc import status_pb2
2723

24+
from google.api_core.protobuf_helpers import get_messages
25+
from google.cloud.bigtable_v2.proto import bigtable_pb2
26+
from google.cloud.bigtable_v2.proto import data_pb2
27+
28+
29+
_shared_modules = [
30+
http_pb2,
31+
any_pb2,
32+
descriptor_pb2,
33+
wrappers_pb2,
34+
status_pb2,
35+
]
36+
37+
_local_modules = [
38+
bigtable_pb2,
39+
data_pb2,
40+
]
41+
2842
names = []
29-
for module in (
30-
http_pb2,
31-
bigtable_pb2,
32-
data_pb2,
33-
any_pb2,
34-
descriptor_pb2,
35-
wrappers_pb2,
36-
status_pb2,
37-
):
43+
44+
for module in _shared_modules:
45+
for name, message in get_messages(module).items():
46+
setattr(sys.modules[__name__], name, message)
47+
names.append(name)
48+
49+
for module in _local_modules:
3850
for name, message in get_messages(module).items():
3951
message.__module__ = 'google.cloud.bigtable_v2.types'
4052
setattr(sys.modules[__name__], name, message)

‎container/google/cloud/container_v1/types.py‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,32 @@
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.container_v1.proto import cluster_service_pb2
2219
from google.protobuf import descriptor_pb2
2320
from google.protobuf import empty_pb2
2421

22+
from google.api_core.protobuf_helpers import get_messages
23+
from google.cloud.container_v1.proto import cluster_service_pb2
24+
25+
26+
_shared_modules = [
27+
http_pb2,
28+
descriptor_pb2,
29+
empty_pb2,
30+
]
31+
32+
_local_modules = [
33+
cluster_service_pb2,
34+
]
35+
2536
names = []
26-
for module in (
27-
http_pb2,
28-
cluster_service_pb2,
29-
descriptor_pb2,
30-
empty_pb2,
31-
):
37+
38+
for module in _shared_modules:
39+
for name, message in get_messages(module).items():
40+
setattr(sys.modules[__name__], name, message)
41+
names.append(name)
42+
43+
for module in _local_modules:
3244
for name, message in get_messages(module).items():
3345
message.__module__ = 'google.cloud.container_v1.types'
3446
setattr(sys.modules[__name__], name, message)

‎dataproc/google/cloud/dataproc_v1/types.py‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +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.dataproc_v1.proto import clusters_pb2
22-
from google.cloud.dataproc_v1.proto import jobs_pb2
23-
from google.cloud.dataproc_v1.proto import operations_pb2 as proto_operations_pb2
2419
from google.longrunning import operations_pb2 as longrunning_operations_pb2
2520
from google.protobuf import any_pb2
2621
from google.protobuf import descriptor_pb2
@@ -30,21 +25,37 @@
3025
from google.protobuf import timestamp_pb2
3126
from google.rpc import status_pb2
3227

28+
from google.api_core.protobuf_helpers import get_messages
29+
from google.cloud.dataproc_v1.proto import clusters_pb2
30+
from google.cloud.dataproc_v1.proto import jobs_pb2
31+
from google.cloud.dataproc_v1.proto import operations_pb2 as proto_operations_pb2
32+
33+
_shared_modules = [
34+
http_pb2,
35+
longrunning_operations_pb2,
36+
any_pb2,
37+
descriptor_pb2,
38+
duration_pb2,
39+
empty_pb2,
40+
field_mask_pb2,
41+
timestamp_pb2,
42+
status_pb2,
43+
]
44+
45+
_local_modules = [
46+
clusters_pb2,
47+
jobs_pb2,
48+
proto_operations_pb2,
49+
]
50+
3351
names = []
34-
for module in (
35-
http_pb2,
36-
clusters_pb2,
37-
jobs_pb2,
38-
proto_operations_pb2,
39-
longrunning_operations_pb2,
40-
any_pb2,
41-
descriptor_pb2,
42-
duration_pb2,
43-
empty_pb2,
44-
field_mask_pb2,
45-
timestamp_pb2,
46-
status_pb2,
47-
):
52+
53+
for module in _shared_modules:
54+
for name, message in get_messages(module).items():
55+
setattr(sys.modules[__name__], name, message)
56+
names.append(name)
57+
58+
for module in _local_modules:
4859
for name, message in get_messages(module).items():
4960
message.__module__ = 'google.cloud.dataproc_v1.types'
5061
setattr(sys.modules[__name__], name, message)

‎datastore/google/cloud/datastore_v1/types.py‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,42 @@
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.datastore_v1.proto import datastore_pb2
22-
from google.cloud.datastore_v1.proto import entity_pb2
23-
from google.cloud.datastore_v1.proto import query_pb2
2419
from google.protobuf import descriptor_pb2
2520
from google.protobuf import struct_pb2
2621
from google.protobuf import timestamp_pb2
2722
from google.protobuf import wrappers_pb2
2823
from google.type import latlng_pb2
2924

25+
from google.api_core.protobuf_helpers import get_messages
26+
from google.cloud.datastore_v1.proto import datastore_pb2
27+
from google.cloud.datastore_v1.proto import entity_pb2
28+
from google.cloud.datastore_v1.proto import query_pb2
29+
30+
31+
_shared_modules = [
32+
http_pb2,
33+
descriptor_pb2,
34+
struct_pb2,
35+
timestamp_pb2,
36+
wrappers_pb2,
37+
latlng_pb2,
38+
]
39+
40+
_local_modules = [
41+
datastore_pb2,
42+
entity_pb2,
43+
query_pb2,
44+
]
45+
3046
names = []
31-
for module in (
32-
http_pb2,
33-
datastore_pb2,
34-
entity_pb2,
35-
query_pb2,
36-
descriptor_pb2,
37-
struct_pb2,
38-
timestamp_pb2,
39-
wrappers_pb2,
40-
latlng_pb2,
41-
):
47+
48+
for module in _shared_modules:
49+
for name, message in get_messages(module).items():
50+
setattr(sys.modules[__name__], name, message)
51+
names.append(name)
52+
53+
for module in _local_modules:
4254
for name, message in get_messages(module).items():
4355
message.__module__ = 'google.cloud.datastore_v1.types'
4456
setattr(sys.modules[__name__], name, message)

0 commit comments

Comments
 (0)