aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/internal/_parameterized.py
diff options
context:
space:
mode:
authorGravatar Dan O'Reilly <oreilldf@gmail.com>2015-08-14 22:54:53 -0400
committerGravatar Dan O'Reilly <oreilldf@gmail.com>2015-08-14 22:54:53 -0400
commit2621c8aefbfefd517a3facc6dc0e0dc45ae5eb87 (patch)
treea12a81028a9ac3b4aab2cfbbfc495e1da82c5669 /python/google/protobuf/internal/_parameterized.py
parentd06adbd4a48c83aa8e9085e988020ad3bff43211 (diff)
Get Python 2.6 working.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
Diffstat (limited to 'python/google/protobuf/internal/_parameterized.py')
-rwxr-xr-xpython/google/protobuf/internal/_parameterized.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/python/google/protobuf/internal/_parameterized.py b/python/google/protobuf/internal/_parameterized.py
index 3002b230..6c5a2bac 100755
--- a/python/google/protobuf/internal/_parameterized.py
+++ b/python/google/protobuf/internal/_parameterized.py
@@ -149,7 +149,10 @@ import collections
import functools
import re
import types
-import unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
import uuid
import six