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/descriptor_pool_test.py | |
| parent | 0087da9d4775f79c67362cc89c653f3a33a9bae2 (diff) | |
Down-integrate from google internal.
Diffstat (limited to 'python/google/protobuf/internal/descriptor_pool_test.py')
| -rw-r--r-- | python/google/protobuf/internal/descriptor_pool_test.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/python/google/protobuf/internal/descriptor_pool_test.py b/python/google/protobuf/internal/descriptor_pool_test.py index 2a482fba..6bbc8233 100644 --- a/python/google/protobuf/internal/descriptor_pool_test.py +++ b/python/google/protobuf/internal/descriptor_pool_test.py @@ -35,11 +35,8 @@ __author__ = 'matthewtoia@google.com (Matt Toia)' import os -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from google.protobuf import unittest_pb2 from google.protobuf import descriptor_pb2 from google.protobuf.internal import api_implementation @@ -47,6 +44,7 @@ from google.protobuf.internal import descriptor_pool_test1_pb2 from google.protobuf.internal import descriptor_pool_test2_pb2 from google.protobuf.internal import factory_test1_pb2 from google.protobuf.internal import factory_test2_pb2 +from google.protobuf.internal import test_util from google.protobuf import descriptor from google.protobuf import descriptor_database from google.protobuf import descriptor_pool |