mirror of
https://github.com/markqvist/Reticulum.git
synced 2024-12-18 10:00:17 +00:00
Allow dynamic sub-module import from compiled python bytecode
This commit is contained in:
parent
19adadf4cf
commit
8df89cc2d0
@ -20,5 +20,7 @@ elif cp.PROVIDER == cp.PROVIDER_PYCA:
|
|||||||
from RNS.Cryptography.Proxies import Ed25519PrivateKeyProxy as Ed25519PrivateKey
|
from RNS.Cryptography.Proxies import Ed25519PrivateKeyProxy as Ed25519PrivateKey
|
||||||
from RNS.Cryptography.Proxies import Ed25519PublicKeyProxy as Ed25519PublicKey
|
from RNS.Cryptography.Proxies import Ed25519PublicKeyProxy as Ed25519PublicKey
|
||||||
|
|
||||||
modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
py_modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
||||||
__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
|
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"))]))
|
@ -23,5 +23,7 @@
|
|||||||
import os
|
import os
|
||||||
import glob
|
import glob
|
||||||
|
|
||||||
modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
py_modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
||||||
__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
|
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"))]))
|
@ -24,5 +24,7 @@ import os
|
|||||||
import glob
|
import glob
|
||||||
import RNS.Interfaces.Android
|
import RNS.Interfaces.Android
|
||||||
|
|
||||||
modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
py_modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
||||||
__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
|
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"))]))
|
@ -283,7 +283,8 @@ class Reticulum:
|
|||||||
time.sleep(1.5)
|
time.sleep(1.5)
|
||||||
|
|
||||||
self.__apply_config()
|
self.__apply_config()
|
||||||
RNS.log("Configuration loaded from "+self.configpath, RNS.LOG_VERBOSE)
|
RNS.log(f"Utilising cryptography backend \"{RNS.Cryptography.Provider.backend()}\"", RNS.LOG_VERBOSE)
|
||||||
|
RNS.log(f"Configuration loaded from {self.configpath}", RNS.LOG_VERBOSE)
|
||||||
|
|
||||||
RNS.Identity.load_known_destinations()
|
RNS.Identity.load_known_destinations()
|
||||||
|
|
||||||
|
@ -23,5 +23,7 @@
|
|||||||
import os
|
import os
|
||||||
import glob
|
import glob
|
||||||
|
|
||||||
modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
py_modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
||||||
__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
|
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"))]))
|
@ -43,8 +43,10 @@ from .Resource import Resource, ResourceAdvertisement
|
|||||||
from .Cryptography import HKDF
|
from .Cryptography import HKDF
|
||||||
from .Cryptography import Hashes
|
from .Cryptography import Hashes
|
||||||
|
|
||||||
modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
py_modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
||||||
__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
|
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"))]))
|
||||||
|
|
||||||
LOG_CRITICAL = 0
|
LOG_CRITICAL = 0
|
||||||
LOG_ERROR = 1
|
LOG_ERROR = 1
|
||||||
|
6
RNS/vendor/__init__.py
vendored
6
RNS/vendor/__init__.py
vendored
@ -1,5 +1,7 @@
|
|||||||
import os
|
import os
|
||||||
import glob
|
import glob
|
||||||
|
|
||||||
modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
py_modules = glob.glob(os.path.dirname(__file__)+"/*.py")
|
||||||
__all__ = [ os.path.basename(f)[:-3] for f in modules if not f.endswith('__init__.py')]
|
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"))]))
|
Loading…
Reference in New Issue
Block a user