From dbea00ae882b0a1df1f76cb5b23657234bf073c4 Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Mon, 5 Oct 2015 16:08:22 -0700 Subject: Revert back changes to import unittest2 for py26 --- python/google/protobuf/internal/descriptor_pool_test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'python/google/protobuf/internal/descriptor_pool_test.py') 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 -- cgit v1.2.3