William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-26 15:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added conditional import of netifaces

Browse Source
This commit is contained in:
Mark Qvist 2021-12-01 11:46:19 +01:00
parent f5236878b0
commit 10854bfdbc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RNS/Interfaces/TCPInterface.py
View File

@ -286,7 +286,7 @@ class TCPServerInterface(Interface):
@staticmethod @staticmethod
def get_address_for_if(name): def get_address_for_if(name):
import importlib import importlib
if importlib.find_loader('netifaces') != None: if importlib.util.find_spec('netifaces') != None:
import netifaces import netifaces
return netifaces.ifaddresses(name)[netifaces.AF_INET][0]['addr'] return netifaces.ifaddresses(name)[netifaces.AF_INET][0]['addr']
else: else:
@ -297,7 +297,7 @@ class TCPServerInterface(Interface):
@staticmethod @staticmethod
def get_broadcast_for_if(name): def get_broadcast_for_if(name):
import importlib import importlib
if importlib.find_loader('netifaces') != None: if importlib.util.find_spec('netifaces') != None:
import netifaces import netifaces
return netifaces.ifaddresses(name)[netifaces.AF_INET][0]['broadcast'] return netifaces.ifaddresses(name)[netifaces.AF_INET][0]['broadcast']
else: else:

4
RNS/Interfaces/UDPInterface.py
View File

@ -12,7 +12,7 @@ class UDPInterface(Interface):
@staticmethod @staticmethod
def get_address_for_if(name): def get_address_for_if(name):
import importlib import importlib
if importlib.find_loader('netifaces') != None: if importlib.util.find_spec('netifaces') != None:
import netifaces import netifaces
return netifaces.ifaddresses(name)[netifaces.AF_INET][0]['addr'] return netifaces.ifaddresses(name)[netifaces.AF_INET][0]['addr']
else: else:
@ -23,7 +23,7 @@ class UDPInterface(Interface):
@staticmethod @staticmethod
def get_broadcast_for_if(name): def get_broadcast_for_if(name):
import importlib import importlib
if importlib.find_loader('netifaces') != None: if importlib.util.find_spec('netifaces') != None:
import netifaces import netifaces
return netifaces.ifaddresses(name)[netifaces.AF_INET][0]['broadcast'] return netifaces.ifaddresses(name)[netifaces.AF_INET][0]['broadcast']
else: else: