Git-Mirrors/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2025-06-08 15:02:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up importlib imports

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
RNS/Cryptography/Hashes.py
View file

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

2
RNS/Cryptography/Provider.py
View file

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

2
RNS/Interfaces/AX25KISSInterface.py
View file

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

2
RNS/Interfaces/Android/KISSInterface.py
View file

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

2
RNS/Interfaces/Android/RNodeInterface.py
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 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 port = c["port"] if "port" in c else None
import importlib import importlib.util
if RNS.vendor.platformutils.is_android(): if RNS.vendor.platformutils.is_android():
self.on_android = True self.on_android = True
if importlib.util.find_spec('usbserial4a') != None: if importlib.util.find_spec('usbserial4a') != None:

2
RNS/Interfaces/Android/SerialInterface.py
View file

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

2
RNS/Interfaces/KISSInterface.py
View file

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

4
RNS/Interfaces/RNodeInterface.py
View file

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

4
RNS/Interfaces/RNodeMultiInterface.py
View file

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

2
RNS/Interfaces/SerialInterface.py
View file

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

2
RNS/Reticulum.py
View file

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

2
RNS/__init__.py
View file

@ -49,7 +49,7 @@ pyc_modules = glob.glob(os.path.dirname(__file__)+"/*.pyc")
modules = py_modules+pyc_modules 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"))])) __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 if importlib.util.find_spec("cython"): import cython; compiled = cython.compiled
else: compiled = False else: compiled = False