diff options
Diffstat (limited to 'cloudinit/importer.py')
-rw-r--r-- | cloudinit/importer.py | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/cloudinit/importer.py b/cloudinit/importer.py index f1194fbe..f84ff4da 100644 --- a/cloudinit/importer.py +++ b/cloudinit/importer.py @@ -9,6 +9,27 @@ # This file is part of cloud-init. See LICENSE file for license information. import sys +import typing + +# annotations add value for development, but don't break old versions +# pyver: 3.5 -> 3.8 +# pylint: disable=E1101 +if sys.version_info >= (3, 8) and hasattr(typing, "TypeDict"): + MetaSchema = typing.TypedDict( + "MetaSchema", + { + "name": str, + "id": str, + "title": str, + "description": str, + "distros": typing.List[str], + "examples": typing.List[str], + "frequency": str, + }, + ) +else: + MetaSchema = dict +# pylint: enable=E1101 def import_module(module_name): @@ -16,7 +37,8 @@ def import_module(module_name): return sys.modules[module_name] -def find_module(base_name, search_paths, required_attrs=None): +def find_module(base_name: str, search_paths, required_attrs=None) -> tuple: + """Finds and imports specified modules""" if not required_attrs: required_attrs = [] # NOTE(harlowja): translate the search paths to include the base name. @@ -26,7 +48,7 @@ def find_module(base_name, search_paths, required_attrs=None): if path: real_path.extend(path.split(".")) real_path.append(base_name) - full_path = '.'.join(real_path) + full_path = ".".join(real_path) lookup_paths.append(full_path) found_paths = [] for full_path in lookup_paths: @@ -45,4 +67,5 @@ def find_module(base_name, search_paths, required_attrs=None): found_paths.append(full_path) return (found_paths, lookup_paths) + # vi: ts=4 expandtab |