Clean up importlib imports

This commit is contained in:
Mark Qvist 2025-04-08 15:23:44 +02:00
parent f8925eaed1
commit f9d42082a2
12 changed files with 14 additions and 14 deletions

View File

@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import importlib
import importlib.util
if importlib.util.find_spec('hashlib') != None:
import hashlib
else:

View File

@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
import importlib
import importlib.util
PROVIDER_NONE = 0x00
PROVIDER_INTERNAL = 0x01

View File

@ -70,7 +70,7 @@ class AX25KISSInterface(Interface):
serial = None
def __init__(self, owner, configuration):
import importlib
import importlib.util
if importlib.util.find_spec('serial') != None:
import serial
else:

View File

@ -63,7 +63,7 @@ class KISSInterface(Interface):
serial = None
def __init__(self, owner, configuration):
import importlib
import importlib.util
if RNS.vendor.platformutils.is_android():
self.on_android = True
if importlib.util.find_spec('usbserial4a') != None:

View File

@ -368,7 +368,7 @@ class RNodeInterface(Interface):
lt_alock = float(c["airtime_limit_long"]) if "airtime_limit_long" in c and c["airtime_limit_long"] != None else None
port = c["port"] if "port" in c else None
import importlib
import importlib.util
if RNS.vendor.platformutils.is_android():
self.on_android = True
if importlib.util.find_spec('usbserial4a') != None:

View File

@ -53,7 +53,7 @@ class SerialInterface(Interface):
serial = None
def __init__(self, owner, configuration):
import importlib
import importlib.util
if RNS.vendor.platformutils.is_android():
self.on_android = True
if importlib.util.find_spec('usbserial4a') != None:

View File

@ -63,7 +63,7 @@ class KISSInterface(Interface):
serial = None
def __init__(self, owner, configuration):
import importlib
import importlib.util
if importlib.util.find_spec('serial') != None:
import serial
else:

View File

@ -126,7 +126,7 @@ class RNodeInterface(Interface):
if RNS.vendor.platformutils.is_android():
raise SystemError("Invalid interface type. The Android-specific RNode interface must be used on Android")
import importlib
import importlib.util
if importlib.util.find_spec('serial') != None:
import serial
else:
@ -1190,7 +1190,7 @@ class BLEConnection():
self.connect_job_running = False
self.device_disappeared = False
import importlib
import importlib.util
if BLEConnection.bleak == None:
if importlib.util.find_spec("bleak") != None:
import bleak

View File

@ -141,7 +141,7 @@ class RNodeMultiInterface(Interface):
if RNS.vendor.platformutils.is_android():
raise SystemError("Invalid interface type. The Android-specific RNode interface must be used on Android")
import importlib
import importlib.util
if importlib.util.find_spec('serial') != None:
import serial
else:
@ -927,7 +927,7 @@ class RNodeSubInterface(Interface):
if RNS.vendor.platformutils.is_android():
raise SystemError("Invalid interface type. The Android-specific RNode interface must be used on Android")
import importlib
import importlib.util
if importlib.util.find_spec('serial') != None:
import serial
else:

View File

@ -53,7 +53,7 @@ class SerialInterface(Interface):
serial = None
def __init__(self, owner, configuration):
import importlib
import importlib.util
if importlib.util.find_spec('serial') != None:
import serial
else:

View File

@ -39,7 +39,7 @@ else:
from RNS.vendor.configobj import ConfigObj
import configparser
import multiprocessing.connection
import importlib
import importlib.util
import threading
import signal
import atexit

View File

@ -49,7 +49,7 @@ pyc_modules = glob.glob(os.path.dirname(__file__)+"/*.pyc")
modules = py_modules+pyc_modules
__all__ = list(set([os.path.basename(f).replace(".pyc", "").replace(".py", "") for f in modules if not (f.endswith("__init__.py") or f.endswith("__init__.pyc"))]))
import importlib
import importlib.util
if importlib.util.find_spec("cython"): import cython; compiled = cython.compiled
else: compiled = False