From 012ac9a0a6d025d3fd874414e8646ead0812aa7a Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Thu, 31 Mar 2016 15:26:22 -0700 Subject: revert unexpected change for py26 --- python/google/protobuf/internal/proto_builder_test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'python') diff --git a/python/google/protobuf/internal/proto_builder_test.py b/python/google/protobuf/internal/proto_builder_test.py index 880b570d..822ad895 100644 --- a/python/google/protobuf/internal/proto_builder_test.py +++ b/python/google/protobuf/internal/proto_builder_test.py @@ -36,7 +36,10 @@ try: from collections import OrderedDict except ImportError: from ordereddict import OrderedDict #PY26 -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest from google.protobuf import descriptor_pb2 from google.protobuf import descriptor_pool from google.protobuf import proto_builder -- cgit v1.2.3