Define cmp() for Python 3 (#3517)
* Define cmp() for Python 3 http://python-future.org/compatible_idioms.html?highlight=cmp#cmp * Define cmp() for Python 3 http://python-future.org/compatible_idioms.html?highlight=cmp#cmp
This commit is contained in:
parent
1aa2c34387
commit
a04eb8c191
@ -55,6 +55,11 @@ from google.protobuf.internal import api_implementation
|
||||
from google.protobuf.internal import test_util
|
||||
from google.protobuf import message
|
||||
|
||||
try:
|
||||
cmp # Python 2
|
||||
except NameError:
|
||||
cmp = lambda(x, y): (x > y) - (x < y) # Python 3
|
||||
|
||||
# Python pre-2.6 does not have isinf() or isnan() functions, so we have
|
||||
# to provide our own.
|
||||
def isnan(val):
|
||||
|
@ -53,9 +53,13 @@ import six
|
||||
import sys
|
||||
|
||||
try:
|
||||
import unittest2 as unittest #PY26
|
||||
import unittest2 as unittest # PY26
|
||||
except ImportError:
|
||||
import unittest
|
||||
try:
|
||||
cmp # Python 2
|
||||
except NameError:
|
||||
cmp = lambda(x, y): (x > y) - (x < y) # Python 3
|
||||
|
||||
from google.protobuf import map_unittest_pb2
|
||||
from google.protobuf import unittest_pb2
|
||||
|
Loading…
Reference in New Issue
Block a user