Changeset 7991

Timestamp:

Sep 3, 2018, 11:56:10 AM (11 months ago)

Author:

Juanma

Message:

Improved compatibility with python3

Location:

python-llxnet/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• src/lliurex/net.py (modified) (2 diffs)

python-llxnet/trunk/fuentes/debian/changelog

@@ +1 @@
+python-llxnet (0.19.2) xenial; urgency=medium
+
+  * Improved compatibility with python3
+
+ -- Juanma Navarro Mañez <juanma1980@gmail.com>  Mon, 03 Sep 2018 11:55:35 +0200
+
 python-llxnet (0.19.1) xenial; urgency=high
 

python-llxnet/trunk/fuentes/src/lliurex/net.py

@@ -155 +155 @@
                                 aux_lines.pop(0)
                                 for line in aux_lines:
+                                        if type(line)!=type(''):
+                                                line=line.decode()
                                         try:
                                                 key,value = [x.strip() for x in line.split(':')]
                                                 dic[key]=[]
                                                 dic[key].append(value)
-                                        except:
+                                        except Exception as e:
                                                 dic[key].append(line)
 
                         info=netifaces.ifaddresses(item)
                         dic["name"]=item
-                        if info.has_key(netifaces.AF_LINK):
-                                if info[netifaces.AF_LINK][0].has_key("addr"):
+
+                        if netifaces.AF_LINK in info.keys():
+                        
+                                if "addr" in info[netifaces.AF_LINK][0].keys():
                                         dic["mac"]=info[netifaces.AF_LINK][0]["addr"]
                                 else:
                                         dic["mac"]=""
-                        if info.has_key(netifaces.AF_INET):
-                                if info[netifaces.AF_INET][0].has_key("broadcast"):
+                        if netifaces.AF_INET in info.keys():
+                                if "broadcast" in info[netifaces.AF_INET][0].keys():
                                         dic["broadcast"]=info[netifaces.AF_INET][0]["broadcast"]
                                 else:
                                         dic["broadcast"]=""
-                                if info[netifaces.AF_INET][0].has_key("netmask"):
+                                if "netmask" in info[netifaces.AF_INET][0].keys():
                                         dic["netmask"]=info[netifaces.AF_INET][0]["netmask"]
                                         dic["bitmask"]=get_net_size(dic["netmask"])
@@ -180 +184 @@
                                         dic["bitmask"]=""
                                         dic["netmask"]=""
-                                if info[netifaces.AF_INET][0].has_key("addr"):
+                                if "addr" in info[netifaces.AF_INET][0].keys():
                                         dic["ip"]=info[netifaces.AF_INET][0]["addr"]
                                 else: