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/text_format_test.py | |
| parent | a783eaf37f42702a0752698926f24edea8612922 (diff) | |
| download | protobuf-dbea00ae882b0a1df1f76cb5b23657234bf073c4.tar.gz protobuf-dbea00ae882b0a1df1f76cb5b23657234bf073c4.tar.bz2 protobuf-dbea00ae882b0a1df1f76cb5b23657234bf073c4.zip | |
Revert back changes to import unittest2 for py26
Diffstat (limited to 'python/google/protobuf/internal/text_format_test.py')
| -rwxr-xr-x | python/google/protobuf/internal/text_format_test.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/python/google/protobuf/internal/text_format_test.py b/python/google/protobuf/internal/text_format_test.py index fb4addeb..cca0ee63 100755 --- a/python/google/protobuf/internal/text_format_test.py +++ b/python/google/protobuf/internal/text_format_test.py @@ -39,7 +39,10 @@ import re import six import string -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest from google.protobuf.internal import _parameterized from google.protobuf import map_unittest_pb2 |