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

Fix for Python3 lambda behavior change

Browse source 
In Python3, lambda no longer support use tuple as syntax.
So, ugly changes is inevitable.
This commit is contained in:
Sunny 2015-02-01 00:42:12 +08:00
parent aa28796524
commit b11d848986
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/common.py
View file

@ -226,12 +226,12 @@ class IPNetwork(object):
addr_family = is_ip(addr) addr_family = is_ip(addr)
if addr_family is socket.AF_INET: if addr_family is socket.AF_INET:
ip, = struct.unpack("!I", socket.inet_aton(addr)) ip, = struct.unpack("!I", socket.inet_aton(addr))
return any(map(lambda (n, ps): n == ip >> ps, return any(map(lambda n_ps: n_ps[0] == ip >> n_ps[1],
self._network_list_v4)) self._network_list_v4))
elif addr_family is socket.AF_INET6: elif addr_family is socket.AF_INET6:
hi, lo = struct.unpack("!QQ", inet_pton(addr_family, addr)) hi, lo = struct.unpack("!QQ", inet_pton(addr_family, addr))
ip = (hi << 64) | lo ip = (hi << 64) | lo
return any(map(lambda (n, ps): n == ip >> ps, return any(map(lambda n_ps: n_ps[0] == ip >> n_ps[1],
self._network_list_v6)) self._network_list_v6))
else: else:
return False return False