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 53090a8

Browse filesBrowse files
tseavertseaver
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 45f1af6 commit 53090a8
Copy full SHA for 53090a8

File tree

Expand file treeCollapse file tree

3 files changed

+96
-60
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+96
-60
lines changed

‎packages/google-cloud-vision/google/cloud/vision_v1/types.py

Copy file name to clipboardExpand all lines: packages/google-cloud-vision/google/cloud/vision_v1/types.py
+31-19Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,46 @@
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.vision_v1.proto import geometry_pb2
22-
from google.cloud.vision_v1.proto import image_annotator_pb2
23-
from google.cloud.vision_v1.proto import text_annotation_pb2
24-
from google.cloud.vision_v1.proto import web_detection_pb2
2519
from google.protobuf import any_pb2
2620
from google.protobuf import descriptor_pb2
2721
from google.protobuf import wrappers_pb2
2822
from google.rpc import status_pb2
2923
from google.type import color_pb2
3024
from google.type import latlng_pb2
3125

26+
from google.api_core.protobuf_helpers import get_messages
27+
from google.cloud.vision_v1.proto import geometry_pb2
28+
from google.cloud.vision_v1.proto import image_annotator_pb2
29+
from google.cloud.vision_v1.proto import text_annotation_pb2
30+
from google.cloud.vision_v1.proto import web_detection_pb2
31+
32+
33+
_shared_modules = [
34+
http_pb2,
35+
any_pb2,
36+
descriptor_pb2,
37+
wrappers_pb2,
38+
status_pb2,
39+
color_pb2,
40+
latlng_pb2,
41+
]
42+
43+
_local_modules = [
44+
geometry_pb2,
45+
image_annotator_pb2,
46+
text_annotation_pb2,
47+
web_detection_pb2,
48+
]
49+
3250
names = []
33-
for module in (
34-
http_pb2,
35-
geometry_pb2,
36-
image_annotator_pb2,
37-
text_annotation_pb2,
38-
web_detection_pb2,
39-
any_pb2,
40-
descriptor_pb2,
41-
wrappers_pb2,
42-
status_pb2,
43-
color_pb2,
44-
latlng_pb2,
45-
):
51+
52+
for module in _shared_modules:
53+
for name, message in get_messages(module).items():
54+
setattr(sys.modules[__name__], name, message)
55+
names.append(name)
56+
57+
for module in _local_modules:
4658
for name, message in get_messages(module).items():
4759
message.__module__ = 'google.cloud.vision_v1.types'
4860
setattr(sys.modules[__name__], name, message)

‎packages/google-cloud-vision/google/cloud/vision_v1p1beta1/types.py

Copy file name to clipboardExpand all lines: packages/google-cloud-vision/google/cloud/vision_v1p1beta1/types.py
+31-19Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,46 @@
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.vision_v1p1beta1.proto import geometry_pb2
22-
from google.cloud.vision_v1p1beta1.proto import image_annotator_pb2
23-
from google.cloud.vision_v1p1beta1.proto import text_annotation_pb2
24-
from google.cloud.vision_v1p1beta1.proto import web_detection_pb2
2519
from google.protobuf import any_pb2
2620
from google.protobuf import descriptor_pb2
2721
from google.protobuf import wrappers_pb2
2822
from google.rpc import status_pb2
2923
from google.type import color_pb2
3024
from google.type import latlng_pb2
3125

26+
from google.api_core.protobuf_helpers import get_messages
27+
from google.cloud.vision_v1p1beta1.proto import geometry_pb2
28+
from google.cloud.vision_v1p1beta1.proto import image_annotator_pb2
29+
from google.cloud.vision_v1p1beta1.proto import text_annotation_pb2
30+
from google.cloud.vision_v1p1beta1.proto import web_detection_pb2
31+
32+
33+
_shared_modules = [
34+
http_pb2,
35+
any_pb2,
36+
descriptor_pb2,
37+
wrappers_pb2,
38+
status_pb2,
39+
color_pb2,
40+
latlng_pb2,
41+
]
42+
43+
_local_modules = [
44+
geometry_pb2,
45+
image_annotator_pb2,
46+
text_annotation_pb2,
47+
web_detection_pb2,
48+
]
49+
3250
names = []
33-
for module in (
34-
http_pb2,
35-
geometry_pb2,
36-
image_annotator_pb2,
37-
text_annotation_pb2,
38-
web_detection_pb2,
39-
any_pb2,
40-
descriptor_pb2,
41-
wrappers_pb2,
42-
status_pb2,
43-
color_pb2,
44-
latlng_pb2,
45-
):
51+
52+
for module in _shared_modules:
53+
for name, message in get_messages(module).items():
54+
setattr(sys.modules[__name__], name, message)
55+
names.append(name)
56+
57+
for module in _local_modules:
4658
for name, message in get_messages(module).items():
4759
message.__module__ = 'google.cloud.vision_v1p1beta1.types'
4860
setattr(sys.modules[__name__], name, message)

‎packages/google-cloud-vision/google/cloud/vision_v1p2beta1/types.py

Copy file name to clipboardExpand all lines: packages/google-cloud-vision/google/cloud/vision_v1p2beta1/types.py
+34-22Lines changed: 34 additions & 22 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.vision_v1p2beta1.proto import geometry_pb2
22-
from google.cloud.vision_v1p2beta1.proto import image_annotator_pb2
23-
from google.cloud.vision_v1p2beta1.proto import text_annotation_pb2
24-
from google.cloud.vision_v1p2beta1.proto import web_detection_pb2
2519
from google.longrunning import operations_pb2
2620
from google.protobuf import any_pb2
2721
from google.protobuf import descriptor_pb2
@@ -32,23 +26,41 @@
3226
from google.type import color_pb2
3327
from google.type import latlng_pb2
3428

29+
from google.api_core.protobuf_helpers import get_messages
30+
from google.cloud.vision_v1p2beta1.proto import geometry_pb2
31+
from google.cloud.vision_v1p2beta1.proto import image_annotator_pb2
32+
from google.cloud.vision_v1p2beta1.proto import text_annotation_pb2
33+
from google.cloud.vision_v1p2beta1.proto import web_detection_pb2
34+
35+
36+
_shared_modules = [
37+
http_pb2,
38+
operations_pb2,
39+
any_pb2,
40+
descriptor_pb2,
41+
empty_pb2,
42+
timestamp_pb2,
43+
wrappers_pb2,
44+
status_pb2,
45+
color_pb2,
46+
latlng_pb2,
47+
]
48+
49+
_local_modules = [
50+
geometry_pb2,
51+
image_annotator_pb2,
52+
text_annotation_pb2,
53+
web_detection_pb2,
54+
]
55+
3556
names = []
36-
for module in (
37-
http_pb2,
38-
geometry_pb2,
39-
image_annotator_pb2,
40-
text_annotation_pb2,
41-
web_detection_pb2,
42-
operations_pb2,
43-
any_pb2,
44-
descriptor_pb2,
45-
empty_pb2,
46-
timestamp_pb2,
47-
wrappers_pb2,
48-
status_pb2,
49-
color_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.vision_v1p2beta1.types'
5466
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.