From a0b8fd52b94c4038c3ed7fb68f8ace57d5647e10 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Mon, 21 Dec 2015 13:43:13 -0800 Subject: [PATCH] Fix Python 2.6 test failures. Change-Id: Ia9e2795b1ff1abb30410ffb3ef96ba6f46dd99d0 --- python/google/protobuf/internal/well_known_types_test.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python/google/protobuf/internal/well_known_types_test.py b/python/google/protobuf/internal/well_known_types_test.py index 60b0c47d03..0e31e6f807 100644 --- a/python/google/protobuf/internal/well_known_types_test.py +++ b/python/google/protobuf/internal/well_known_types_test.py @@ -36,10 +36,14 @@ __author__ = 'jieluo@google.com (Jie Luo)' from datetime import datetime +try: + import unittest2 as unittest +except ImportError: + import unittest + from google.protobuf import duration_pb2 from google.protobuf import field_mask_pb2 from google.protobuf import timestamp_pb2 -import unittest from google.protobuf import unittest_pb2 from google.protobuf.internal import test_util from google.protobuf.internal import well_known_types