revert unexpected change for py26

This commit is contained in:
Jisi Liu 2016-03-31 15:26:22 -07:00
parent bc1f2e7e6e
commit 012ac9a0a6

View file

@ -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