vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix cmp in Python 3

Browse source
This commit is contained in:
破娃酱 2017-05-31 17:46:07 +08:00
parent f31a81665c
commit b89931f9fc
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shadowsocks/common.py
View file

@ -297,6 +297,12 @@ class IPNetwork(object):
def __cmp__(self, other): def __cmp__(self, other):
return cmp(self.addrs_str, other.addrs_str) return cmp(self.addrs_str, other.addrs_str)
def __eq__(self, other):
return self.addrs_str == other.addrs_str
def __ne__(self, other):
return self.addrs_str != other.addrs_str
class PortRange(object): class PortRange(object):
def __init__(self, range_str): def __init__(self, range_str):
self.range_str = to_str(range_str) self.range_str = to_str(range_str)
@ -328,6 +334,12 @@ class PortRange(object):
def __cmp__(self, other): def __cmp__(self, other):
return cmp(self.range_str, other.range_str) return cmp(self.range_str, other.range_str)
def __eq__(self, other):
return self.range_str == other.range_str
def __ne__(self, other):
return self.range_str != other.range_str
def test_inet_conv(): def test_inet_conv():
ipv4 = b'8.8.4.4' ipv4 = b'8.8.4.4'
b = inet_pton(socket.AF_INET, ipv4) b = inet_pton(socket.AF_INET, ipv4)