masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #435 from colajam93/fix-network

Browse Source 
Fix network module error with netifaces 0.10.5
This commit is contained in:
enkore 2016-08-28 13:19:39 +02:00 committed by GitHub
commit 7e00e38051
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
i3pystatus/network.py
View File

@ -13,16 +13,8 @@ def count_bits(integer):
return bits
def v6_to_int(v6):
return int(v6.replace(":", ""), 16)
def prefix6(mask):
return count_bits(v6_to_int(mask))
def cidr6(addr, mask):
return "{addr}/{bits}".format(addr=addr, bits=prefix6(mask))
def cidr6(addr, bits):
return "{addr}/{bits}".format(addr=addr, bits=bits)
def v4_to_int(v4):
@ -126,8 +118,9 @@ class NetworkInfo:
if netifaces.AF_INET6 in network_info:
for v6 in network_info[netifaces.AF_INET6]:
info["v6"] = v6["addr"]
info["v6mask"] = v6["netmask"]
info["v6cidr"] = cidr6(v6["addr"], v6["netmask"])
mask, bits = v6["netmask"].split("/")
info["v6mask"] = mask
info["v6cidr"] = cidr6(v6["addr"], bits)
if not v6["addr"].startswith("fe80::"): # prefer non link-local addresses
break
return info