浏览代码

revert unexpected change for py26

Jisi Liu 9 年之前
父节点
当前提交
012ac9a0a6
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      python/google/protobuf/internal/proto_builder_test.py

+ 4 - 1
python/google/protobuf/internal/proto_builder_test.py

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