diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/utils/__init__.py | 58 | ||||
| -rw-r--r-- | python/vyos/version.py | 11 | ||||
| -rw-r--r-- | python/vyos/vyconf_session.py | 11 |
3 files changed, 58 insertions, 22 deletions
diff --git a/python/vyos/utils/__init__.py b/python/vyos/utils/__init__.py index 280cde17f..2d934b75f 100644 --- a/python/vyos/utils/__init__.py +++ b/python/vyos/utils/__init__.py @@ -13,21 +13,43 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library. If not, see <http://www.gnu.org/licenses/>. -from vyos.utils import assertion -from vyos.utils import auth -from vyos.utils import boot -from vyos.utils import commit -from vyos.utils import configfs -from vyos.utils import convert -from vyos.utils import cpu -from vyos.utils import dict -from vyos.utils import file -from vyos.utils import io -from vyos.utils import kernel -from vyos.utils import list -from vyos.utils import locking -from vyos.utils import misc -from vyos.utils import network -from vyos.utils import permission -from vyos.utils import process -from vyos.utils import system +import importlib + +__all__ = [ + 'assertion', + 'auth', + 'boot', + 'commit', + 'configfs', + 'convert', + 'cpu', + 'dict', + 'file', + 'io', + 'kernel', + 'list', + 'locking', + 'misc', + 'network', + 'permission', + 'process', + 'system', +] + + +def __getattr__(name): + """Import submodules on first access (PEP 562). + + Importing them eagerly pulled the whole set into every consumer of + 'from vyos.utils.<sub> import <name>', which is a measurable cost on the + conf-mode script path where each script is a fresh interpreter. + """ + if name not in __all__: + raise AttributeError(f'module {__name__!r} has no attribute {name!r}') + mod = importlib.import_module(f'{__name__}.{name}') + globals()[name] = mod + return mod + + +def __dir__(): + return sorted(list(globals()) + __all__) diff --git a/python/vyos/version.py b/python/vyos/version.py index 4ba44f166..4288a26ff 100644 --- a/python/vyos/version.py +++ b/python/vyos/version.py @@ -31,10 +31,7 @@ Example of the version data dict:: import os -import requests import vyos.defaults -from vyos.system.image import is_live_boot -from urllib3.util import retry from vyos.utils.file import read_file from vyos.utils.file import read_json @@ -70,6 +67,11 @@ def get_version(fname=version_file): def get_full_version_data(fname=version_file): + # Imported here rather than at module scope: vyos.system.image pulls in + # vyos.system.grub -> vyos.template -> jinja2, which every consumer of + # vyos.version would otherwise pay for on import. + from vyos.system.image import is_live_boot + version_data = get_version_data(fname) # Get system architecture (well, kernel architecture rather) @@ -126,6 +128,9 @@ def get_remote_version(url): ] """ + import requests + from urllib3.util import retry + headers = {} session = requests.Session() diff --git a/python/vyos/vyconf_session.py b/python/vyos/vyconf_session.py index 91e51338c..932c87964 100644 --- a/python/vyos/vyconf_session.py +++ b/python/vyos/vyconf_session.py @@ -31,7 +31,6 @@ from vyos.proto.vyconf_proto import Errnum from vyos.utils.commit import acquire_commit_lock_file from vyos.utils.commit import release_commit_lock_file from vyos.utils.commit import call_commit_hooks -from vyos.remote import get_config_file class VyconfSessionError(Exception): @@ -246,6 +245,11 @@ class VyconfSession: self, file_name: str, migrate: bool = False, cached: bool = False ) -> tuple[str, int]: # pylint: disable=consider-using-with + # Imported here rather than at module scope: vyos.remote pulls in + # paramiko and requests, which every consumer of vyos.config would + # otherwise pay for on import. + from vyos.remote import get_config_file + file_path = tempfile.NamedTemporaryFile(delete=False).name err = get_config_file(file_name, file_path) if err: @@ -275,6 +279,11 @@ class VyconfSession: self, file_name: str, migrate: bool = False, destructive: bool = False ) -> tuple[str, int]: # pylint: disable=consider-using-with + # Imported here rather than at module scope: vyos.remote pulls in + # paramiko and requests, which every consumer of vyos.config would + # otherwise pay for on import. + from vyos.remote import get_config_file + file_path = tempfile.NamedTemporaryFile(delete=False).name err = get_config_file(file_name, file_path) if err: |