reverting import changes

aristanetworks · Jun 6, 2024 · 8d442ed · 8d442ed
1 parent 5d87936
commit 8d442ed
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 82 deletions.
diff --git a/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_facts/vlans.py b/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_facts/vlans.py
@@ -7,14 +7,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.filter.list_compress import list_compress
 from ansible_collections.arista.avd.plugins.filter.range_expand import range_expand
 from ansible_collections.arista.avd.plugins.plugin_utils.utils import get

diff --git a/...ions/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/connected_endpoints_keys.py b/...ions/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/connected_endpoints_keys.py
@@ -6,14 +6,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.plugin_utils.utils import get
 
 if TYPE_CHECKING:

diff --git a/..._collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/filtered_tenants.py b/..._collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/filtered_tenants.py
@@ -6,14 +6,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.filter.natural_sort import natural_sort
 from ansible_collections.arista.avd.plugins.filter.range_expand import range_expand
 from ansible_collections.arista.avd.plugins.plugin_utils.errors import AristaAvdError, AristaAvdMissingVariableError

diff --git a/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/misc.py b/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/misc.py
@@ -7,14 +7,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.filter.natural_sort import natural_sort
 from ansible_collections.arista.avd.plugins.filter.range_expand import range_expand
 from ansible_collections.arista.avd.plugins.plugin_utils.errors.errors import AristaAvdError, AristaAvdMissingVariableError

diff --git a/...le_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/node_type_keys.py b/...le_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/node_type_keys.py
@@ -6,14 +6,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.plugin_utils.errors import AristaAvdMissingVariableError
 from ansible_collections.arista.avd.plugins.plugin_utils.utils import get
 

diff --git a/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/switch_data.py b/ansible_collections/arista/avd/plugins/plugin_utils/eos_designs_shared_utils/switch_data.py
@@ -6,14 +6,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.plugin_utils.merge import merge
 from ansible_collections.arista.avd.plugins.plugin_utils.utils import get
 

diff --git a/ansible_collections/arista/avd/plugins/plugin_utils/schema/avddataconverter.py b/ansible_collections/arista/avd/plugins/plugin_utils/schema/avddataconverter.py
@@ -5,14 +5,7 @@
 
 from typing import TYPE_CHECKING, Generator
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.plugin_utils.errors import AvdConversionWarning, AvdDeprecationWarning
 from ansible_collections.arista.avd.plugins.plugin_utils.utils import get_all
 

diff --git a/ansible_collections/arista/avd/roles/eos_designs/python_modules/base/avdstructuredconfig.py b/ansible_collections/arista/avd/roles/eos_designs/python_modules/base/avdstructuredconfig.py
@@ -5,14 +5,7 @@
 
 from functools import cached_property
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.filter.natural_sort import natural_sort
 from ansible_collections.arista.avd.plugins.plugin_utils.avdfacts import AvdFacts
 from ansible_collections.arista.avd.plugins.plugin_utils.errors import AristaAvdMissingVariableError

diff --git a/ansible_collections/arista/avd/roles/eos_designs/python_modules/connected_endpoints/utils.py b/ansible_collections/arista/avd/roles/eos_designs/python_modules/connected_endpoints/utils.py
@@ -7,14 +7,7 @@
 from functools import cached_property
 from hashlib import sha256
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.filter.generate_esi import generate_esi
 from ansible_collections.arista.avd.plugins.filter.generate_route_target import generate_route_target
 from ansible_collections.arista.avd.plugins.plugin_utils.eos_designs_shared_utils import SharedUtils

diff --git a/...lections/arista/avd/roles/eos_designs/python_modules/core_interfaces_and_l3_edge/utils.py b/...lections/arista/avd/roles/eos_designs/python_modules/core_interfaces_and_l3_edge/utils.py
@@ -9,14 +9,7 @@
 from ipaddress import ip_network
 from itertools import islice
 
-try:
-    from pyavd.j2filters.convert_dicts import convert_dicts
-
-    PYAVD_IMPORT_EXCEPTION = None
-except ImportError as e:
-    convert_dicts = None
-    PYAVD_IMPORT_EXCEPTION = e
-
+from ansible_collections.arista.avd.plugins.filter.convert_dicts import convert_dicts
 from ansible_collections.arista.avd.plugins.plugin_utils.eos_designs_shared_utils import SharedUtils
 from ansible_collections.arista.avd.plugins.plugin_utils.errors import AristaAvdMissingVariableError
 from ansible_collections.arista.avd.plugins.plugin_utils.merge import merge

diff --git a/python-avd/pyavd/j2filters/convert_dicts.py b/python-avd/pyavd/j2filters/convert_dicts.py
@@ -1,9 +1,8 @@
 # Copyright (c) 2024 Arista Networks, Inc.
 # Use of this source code is governed by the Apache License 2.0
 # that can be found in the LICENSE file.
-from __future__ import absolute_import, division, print_function
+from __future__ import annotations
 
-__metaclass__ = type
 import os