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

Better checking of the MAC address

Browse Source 
Use a Try... Except... block instead of a function flag when checking
for the MAC address. This has the benefit of requiring no changes for
user, but fixes the problem with interfaces that do not have MACs.
This commit is contained in:
Jason Hite 2014-04-02 15:49:05 -04:00
parent 3bbd8d4765
commit 10aca8d489
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
i3pystatus/network.py
View File

@ -74,7 +74,6 @@ class Network(IntervalModule):
"format_down", "color_down", "format_down", "color_down",
("detached_down", "If the interface doesn't exist, display it as if it were down"), ("detached_down", "If the interface doesn't exist, display it as if it were down"),
"name", "name",
("mac", "Try and fetch the interface MAC address, default True")
) )
name = interface = "eth0" name = interface = "eth0"
@ -83,8 +82,6 @@ class Network(IntervalModule):
color_up = "#00FF00" color_up = "#00FF00"
color_down = "#FF0000" color_down = "#FF0000"
detached_down = False detached_down = False
mac = True
def init(self): def init(self):
if self.interface not in netifaces.interfaces() and not self.detached_down: if self.interface not in netifaces.interfaces() and not self.detached_down:
@ -101,14 +98,16 @@ class Network(IntervalModule):
up = netifaces.AF_INET in info or netifaces.AF_INET6 in info up = netifaces.AF_INET in info or netifaces.AF_INET6 in info
fdict = dict( fdict = dict(
zip_longest(["v4", "v4mask", "v4cidr", "v6", "v6mask", "v6cidr"], [], fillvalue="")) zip_longest(["v4", "v4mask", "v4cidr", "v6", "v6mask", "v6cidr"], [], fillvalue=""))
try:
mac = info[netifaces.AF_PACKET][0]["addr"]
except KeyError:
mac = "NONE"
fdict.update({ fdict.update({
"interface": self.interface, "interface": self.interface,
"name": self.name, "name": self.name,
"mac": mac,
}) })
if self.mac:
fdict["mac"] = info[netifaces.AF_PACKET][0]["addr"]
else:
fdict["mac"] = "NONE"
if up: if up:
format = self.format_up format = self.format_up