diff options
| author | Dan O'Reilly <oreilldf@gmail.com> | 2015-08-14 22:54:53 -0400 |
|---|---|---|
| committer | Dan O'Reilly <oreilldf@gmail.com> | 2015-08-14 22:54:53 -0400 |
| commit | 2621c8aefbfefd517a3facc6dc0e0dc45ae5eb87 (patch) | |
| tree | a12a81028a9ac3b4aab2cfbbfc495e1da82c5669 /python/google/protobuf/internal/descriptor_database_test.py | |
| parent | d06adbd4a48c83aa8e9085e988020ad3bff43211 (diff) | |
| download | protobuf-2621c8aefbfefd517a3facc6dc0e0dc45ae5eb87.tar.gz protobuf-2621c8aefbfefd517a3facc6dc0e0dc45ae5eb87.tar.bz2 protobuf-2621c8aefbfefd517a3facc6dc0e0dc45ae5eb87.zip | |
Get Python 2.6 working.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
Diffstat (limited to 'python/google/protobuf/internal/descriptor_database_test.py')
| -rw-r--r-- | python/google/protobuf/internal/descriptor_database_test.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/python/google/protobuf/internal/descriptor_database_test.py b/python/google/protobuf/internal/descriptor_database_test.py index 3241cb72..1baff7d1 100644 --- a/python/google/protobuf/internal/descriptor_database_test.py +++ b/python/google/protobuf/internal/descriptor_database_test.py @@ -34,7 +34,10 @@ __author__ = 'matthewtoia@google.com (Matt Toia)' -import unittest +try: + import unittest2 as unittest +except ImportError: + import unittest from google.protobuf import descriptor_pb2 from google.protobuf.internal import factory_test2_pb2 from google.protobuf import descriptor_database |