diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 11:59:43 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 11:59:43 -0700 |
| commit | 46e8ff63cb67a6520711da5317aaaef04d0414d0 (patch) | |
| tree | 64370726fe469f8dfca7b14f8b8cb80b6cc856f6 /python/google/protobuf/internal/text_format_test.py | |
| parent | 0087da9d4775f79c67362cc89c653f3a33a9bae2 (diff) | |
Down-integrate from google internal.
Diffstat (limited to 'python/google/protobuf/internal/text_format_test.py')
| -rwxr-xr-x | python/google/protobuf/internal/text_format_test.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/python/google/protobuf/internal/text_format_test.py b/python/google/protobuf/internal/text_format_test.py index d332b77d..fb4addeb 100755 --- a/python/google/protobuf/internal/text_format_test.py +++ b/python/google/protobuf/internal/text_format_test.py @@ -34,14 +34,12 @@ __author__ = 'kenton@google.com (Kenton Varda)' + import re import six import string -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from google.protobuf.internal import _parameterized from google.protobuf import map_unittest_pb2 @@ -389,7 +387,7 @@ class TextFormatTest(TextFormatBase): # Ideally the schemas would be made more similar so these tests could pass. class OnlyWorksWithProto2RightNowTests(TextFormatBase): - def testPrintAllFieldsPointy(self, message_module): + def testPrintAllFieldsPointy(self): message = unittest_pb2.TestAllTypes() test_util.SetAllFields(message) self.CompareToGoldenFile( |