tools/telemetry/third_party/gsutil/third_party/protorpc/protorpc/non_sdk_imports.py - Issue 1260493004: Revert "Add gsutil 4.13 to telemetry/third_party"

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: tools/telemetry/third_party/gsutil/third_party/protorpc/protorpc/non_sdk_imports.py

Issue 1260493004: Revert "Add gsutil 4.13 to telemetry/third_party" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 months 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 | « tools/telemetry/third_party/gsutil/third_party/protorpc/protorpc/messages_test.py ('k') | tools/telemetry/third_party/gsutil/third_party/protorpc/protorpc/protobuf.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/third_party/gsutil/third_party/protorpc/protorpc/non_sdk_imports.py

diff --git a/tools/telemetry/third_party/gsutil/third_party/protorpc/protorpc/non_sdk_imports.py b/tools/telemetry/third_party/gsutil/third_party/protorpc/protorpc/non_sdk_imports.py

deleted file mode 100644

index 5b971ecc6de41f80f851b7c32c48e8f304784b45..0000000000000000000000000000000000000000

--- a/tools/telemetry/third_party/gsutil/third_party/protorpc/protorpc/non_sdk_imports.py

+++ /dev/null

@@ -1,21 +0,0 @@

-"""Dynamically decide from where to import other non SDK Google modules.

-All other protorpc code should import other non SDK modules from

-this module. If necessary, add new imports here (in both places).

-"""

-__author__ = 'yey@google.com (Ye Yuan)'

-# pylint: disable=g-import-not-at-top

-# pylint: disable=unused-import

-try:

- from google.protobuf import descriptor

- normal_environment = True

-except ImportError:

- normal_environment = False

-if normal_environment:

- from google.protobuf import descriptor_pb2

- from google.protobuf import message

- from google.protobuf import reflection