From 9a35eb712a942c840c465568d8a2c1c0b8594243 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 27 Feb 2024 02:20:04 -0700 Subject: [PATCH] Avoid circular imports on mac os --- salt/utils/templates.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/utils/templates.py b/salt/utils/templates.py index 7089d66797f..317ccb43460 100644 --- a/salt/utils/templates.py +++ b/salt/utils/templates.py @@ -29,7 +29,6 @@ import salt.utils.yamlencoding from salt import __path__ as saltpath from salt.exceptions import CommandExecutionError, SaltInvocationError, SaltRenderError from salt.loader.context import NamedLoaderContext -from salt.loader.dunder import __file_client__ from salt.utils.decorators.jinja import JinjaFilter, JinjaGlobal, JinjaTest from salt.utils.odict import OrderedDict from salt.utils.versions import Version @@ -358,6 +357,8 @@ def render_jinja_tmpl(tmplstr, context, tmplpath=None): if tmplpath: loader = jinja2.FileSystemLoader(os.path.dirname(tmplpath)) else: + from salt.loader.dunder import __file_client__ + loader = salt.utils.jinja.SaltCacheLoader( opts, saltenv,