diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 16:08:22 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-10-05 16:08:22 -0700 |
| commit | dbea00ae882b0a1df1f76cb5b23657234bf073c4 (patch) | |
| tree | 75a2effc7e836c4e65896bdf2e0942a0dbe25b91 /python/google/protobuf/internal/reflection_test.py | |
| parent | a783eaf37f42702a0752698926f24edea8612922 (diff) | |
Revert back changes to import unittest2 for py26
Diffstat (limited to 'python/google/protobuf/internal/reflection_test.py')
| -rwxr-xr-x | python/google/protobuf/internal/reflection_test.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/python/google/protobuf/internal/reflection_test.py b/python/google/protobuf/internal/reflection_test.py index 6815c238..8621d61e 100755 --- a/python/google/protobuf/internal/reflection_test.py +++ b/python/google/protobuf/internal/reflection_test.py @@ -41,7 +41,10 @@ import operator import six import struct -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest from google.protobuf import unittest_import_pb2 from google.protobuf import unittest_mset_pb2 from google.protobuf import unittest_pb2 @@ -1623,7 +1626,7 @@ class ReflectionTest(unittest.TestCase): self.assertFalse(proto.IsInitialized(errors)) self.assertEqual(errors, ['a', 'b', 'c']) - @test_util.skipIf( + @unittest.skipIf( api_implementation.Type() != 'cpp' or api_implementation.Version() != 2, 'Errors are only available from the most recent C++ implementation.') def testFileDescriptorErrors(self): @@ -2822,7 +2825,7 @@ class OptionsTest(unittest.TestCase): class ClassAPITest(unittest.TestCase): - @test_util.skipIf( + @unittest.skipIf( api_implementation.Type() == 'cpp' and api_implementation.Version() == 2, 'C++ implementation requires a call to MakeDescriptor()') def testMakeClassWithNestedDescriptor(self): |