Skip to content

P
protobuf
Commit 012ac9a0 authored by Jisi Liu's avatar Jisi Liu
Browse files
Options

revert unexpected change for py26

parent bc1f2e7e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
python/google/protobuf/internal/proto_builder_test.py
View file @ 012ac9a0
...@@ -36,7 +36,10 @@ try: ...@@ -36,7 +36,10 @@ try:
from collections import OrderedDict from collections import OrderedDict
except ImportError: except ImportError:
from ordereddict import OrderedDict #PY26 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_pb2
from google.protobuf import descriptor_pool from google.protobuf import descriptor_pool
from google.protobuf import proto_builder from google.protobuf import proto_builder
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment