diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-03-31 15:26:22 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-03-31 15:26:22 -0700 |
| commit | 012ac9a0a6d025d3fd874414e8646ead0812aa7a (patch) | |
| tree | f5a26dbf037983c75d8645b0f3f10beb8f3db832 /python | |
| parent | bc1f2e7e6e416aa3428817dd3e43e531e81b399d (diff) | |
| download | protobuf-012ac9a0a6d025d3fd874414e8646ead0812aa7a.tar.gz protobuf-012ac9a0a6d025d3fd874414e8646ead0812aa7a.tar.bz2 protobuf-012ac9a0a6d025d3fd874414e8646ead0812aa7a.zip | |
revert unexpected change for py26
Diffstat (limited to 'python')
| -rw-r--r-- | python/google/protobuf/internal/proto_builder_test.py | 5 |
1 files changed, 4 insertions, 1 deletions
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 |