Skip to content

Commit

Permalink
revert unexpected change for py26
Browse files Browse the repository at this point in the history
  • Loading branch information
liujisi committed Mar 31, 2016
1 parent bc1f2e7 commit 012ac9a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion python/google/protobuf/internal/proto_builder_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@
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
Expand Down

0 comments on commit 012ac9a

Please sign in to comment.