third_party/protobuf/python/google/protobuf/internal/descriptor_test.py - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

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/protobuf/python/google/protobuf/internal/descriptor_test.py

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 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 | « third_party/protobuf/python/google/protobuf/internal/descriptor_pool_test2.proto ('k') | third_party/protobuf/python/google/protobuf/internal/generator_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/python/google/protobuf/internal/descriptor_test.py

diff --git a/third_party/protobuf/python/google/protobuf/internal/descriptor_test.py b/third_party/protobuf/python/google/protobuf/internal/descriptor_test.py

index fee09a5627f231d63a7815ca25ddaff7ec3a3aef..b8e75553358f5d72191cf30cf4ef9f9b04421431 100755

--- a/third_party/protobuf/python/google/protobuf/internal/descriptor_test.py

+++ b/third_party/protobuf/python/google/protobuf/internal/descriptor_test.py

@@ -37,9 +37,10 @@ __author__ = 'robinson@google.com (Will Robinson)'

import sys

try:

- import unittest2 as unittest

+ import unittest2 as unittest #PY26

except ImportError:

import unittest

from google.protobuf import unittest_custom_options_pb2

from google.protobuf import unittest_import_pb2

from google.protobuf import unittest_pb2

@@ -596,7 +597,7 @@ class DescriptorCopyToProtoTest(unittest.TestCase):

"""

self._InternalTestCopyToProto(

- unittest_pb2._FOREIGNENUM,

+ unittest_pb2.ForeignEnum.DESCRIPTOR,

descriptor_pb2.EnumDescriptorProto,

TEST_FOREIGN_ENUM_ASCII)