Changeset 7991
- Timestamp:
- Sep 3, 2018, 11:56:10 AM (3 years ago)
- Location:
- python-llxnet/trunk/fuentes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
python-llxnet/trunk/fuentes/debian/changelog
r6263 r7991 1 python-llxnet (0.19.2) xenial; urgency=medium 2 3 * Improved compatibility with python3 4 5 -- Juanma Navarro Mañez <juanma1980@gmail.com> Mon, 03 Sep 2018 11:55:35 +0200 6 1 7 python-llxnet (0.19.1) xenial; urgency=high 2 8 -
python-llxnet/trunk/fuentes/src/lliurex/net.py
r6249 r7991 155 155 aux_lines.pop(0) 156 156 for line in aux_lines: 157 if type(line)!=type(''): 158 line=line.decode() 157 159 try: 158 160 key,value = [x.strip() for x in line.split(':')] 159 161 dic[key]=[] 160 162 dic[key].append(value) 161 except :163 except Exception as e: 162 164 dic[key].append(line) 163 165 164 166 info=netifaces.ifaddresses(item) 165 167 dic["name"]=item 166 if info.has_key(netifaces.AF_LINK): 167 if info[netifaces.AF_LINK][0].has_key("addr"): 168 169 if netifaces.AF_LINK in info.keys(): 170 171 if "addr" in info[netifaces.AF_LINK][0].keys(): 168 172 dic["mac"]=info[netifaces.AF_LINK][0]["addr"] 169 173 else: 170 174 dic["mac"]="" 171 if info.has_key(netifaces.AF_INET):172 if info[netifaces.AF_INET][0].has_key("broadcast"):175 if netifaces.AF_INET in info.keys(): 176 if "broadcast" in info[netifaces.AF_INET][0].keys(): 173 177 dic["broadcast"]=info[netifaces.AF_INET][0]["broadcast"] 174 178 else: 175 179 dic["broadcast"]="" 176 if info[netifaces.AF_INET][0].has_key("netmask"):180 if "netmask" in info[netifaces.AF_INET][0].keys(): 177 181 dic["netmask"]=info[netifaces.AF_INET][0]["netmask"] 178 182 dic["bitmask"]=get_net_size(dic["netmask"]) … … 180 184 dic["bitmask"]="" 181 185 dic["netmask"]="" 182 if info[netifaces.AF_INET][0].has_key("addr"):186 if "addr" in info[netifaces.AF_INET][0].keys(): 183 187 dic["ip"]=info[netifaces.AF_INET][0]["addr"] 184 188 else:
Note: See TracChangeset
for help on using the changeset viewer.