third_party/gsutil/third_party/apitools/apitools/gen/message_registry.py - Issue 1380943003: Roll version of gsutil to 4.15.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/gsutil/third_party/apitools/apitools/gen/message_registry.py

Issue 1380943003: Roll version of gsutil to 4.15. (Closed) Base URL: https://github.com/catapult-project/catapult.git@master

Patch Set: rebase Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/gsutil/third_party/apitools/apitools/gen/gen_client_lib.py ('k') | third_party/gsutil/third_party/apitools/apitools/gen/service_registry.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/gsutil/third_party/apitools/apitools/gen/message_registry.py

diff --git a/third_party/gsutil/third_party/apitools/apitools/gen/message_registry.py b/third_party/gsutil/third_party/apitools/apitools/gen/message_registry.py

old mode 100755

new mode 100644

index 4a7a3e9e94f9b36fe39c1424b667f40c77bd267b..d467e9bd10656fe1e86fbe8948fdccc369790c80

--- a/third_party/gsutil/third_party/apitools/apitools/gen/message_registry.py

+++ b/third_party/gsutil/third_party/apitools/apitools/gen/message_registry.py

@@ -73,7 +73,7 @@ class MessageRegistry(object):

package=self.__package, description=self.__description)

# Add required imports

self.__file_descriptor.additional_imports = [

- 'from protorpc import messages',

+ 'from protorpc import messages as _messages',

]

# Map from scoped names (i.e. Foo.Bar) to MessageDescriptors.

self.__message_registry = collections.OrderedDict()

@@ -394,7 +394,8 @@ class MessageRegistry(object):

attrs['format'], type_name))

if (type_info.type_name.startswith('protorpc.message_types.') or

type_info.type_name.startswith('message_types.')):

- self.__AddImport('from protorpc import message_types')

+ self.__AddImport(

+ 'from protorpc import message_types as _message_types')

if type_info.type_name.startswith('extra_types.'):

self.__AddImport(

'from %s import extra_types' % self.__base_files_package)