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/descriptor_pool_test.py | |
| parent | a783eaf37f42702a0752698926f24edea8612922 (diff) | |
Revert back changes to import unittest2 for py26
Diffstat (limited to 'python/google/protobuf/internal/descriptor_pool_test.py')
| -rw-r--r-- | python/google/protobuf/internal/descriptor_pool_test.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/python/google/protobuf/internal/descriptor_pool_test.py b/python/google/protobuf/internal/descriptor_pool_test.py index 6bbc8233..da9a78db 100644 --- a/python/google/protobuf/internal/descriptor_pool_test.py +++ b/python/google/protobuf/internal/descriptor_pool_test.py @@ -36,7 +36,10 @@ __author__ = 'matthewtoia@google.com (Matt Toia)' import os -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest from google.protobuf import unittest_pb2 from google.protobuf import descriptor_pb2 from google.protobuf.internal import api_implementation |