diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-25 20:24:43 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-25 20:24:43 -0700 |
| commit | b192ba87f72b5e3e8add09bbcbb7623831e3079b (patch) | |
| tree | affb3beff3c33050e7f93647ddab8606899ff03d /python/google/protobuf/internal/unknown_fields_test.py | |
| parent | 5da0b46811a103bd1a953f496d4bcd5ff45d3736 (diff) | |
| parent | cf94f7b74495d08b833056016e045a0ae3fb64fa (diff) | |
| download | protobuf-b192ba87f72b5e3e8add09bbcbb7623831e3079b.tar.gz protobuf-b192ba87f72b5e3e8add09bbcbb7623831e3079b.tar.bz2 protobuf-b192ba87f72b5e3e8add09bbcbb7623831e3079b.zip | |
Merge remote-tracking branch 'origin/master' into beta-1
Diffstat (limited to 'python/google/protobuf/internal/unknown_fields_test.py')
| -rwxr-xr-x | python/google/protobuf/internal/unknown_fields_test.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/python/google/protobuf/internal/unknown_fields_test.py b/python/google/protobuf/internal/unknown_fields_test.py index 0dda805b..011d3b55 100755 --- a/python/google/protobuf/internal/unknown_fields_test.py +++ b/python/google/protobuf/internal/unknown_fields_test.py @@ -35,7 +35,11 @@ __author__ = 'bohdank@google.com (Bohdan Koval)' -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest + from google.protobuf import unittest_mset_pb2 from google.protobuf import unittest_pb2 from google.protobuf import unittest_proto3_arena_pb2 |