From a03b7ee2c67cb0d82e852ff4f95b5958301c26fd Mon Sep 17 00:00:00 2001 From: TheWii <67249660+TheWii@users.noreply.github.com> Date: Thu, 11 Aug 2022 22:39:34 -0300 Subject: [PATCH 1/2] fix: import parser properly delegates to resource location parser --- bolt/parse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt/parse.py b/bolt/parse.py index 9f40eba..ef0a642 100644 --- a/bolt/parse.py +++ b/bolt/parse.py @@ -268,7 +268,7 @@ def get_bolt_parsers( ), "bolt:import": AlternativeParser( [ - ImportLocationConstraint(parsers["resource_location_or_tag"]), + ImportLocationConstraint(delegate("resource_location_or_tag")), parse_python_import, ] ), From 438e69734d0ec30035bc29d5a08ee0060791c360 Mon Sep 17 00:00:00 2001 From: TheWii <67249660+TheWii@users.noreply.github.com> Date: Fri, 12 Aug 2022 11:17:34 -0300 Subject: [PATCH 2/2] disable interpolation --- bolt/parse.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bolt/parse.py b/bolt/parse.py index ef0a642..fcecc0a 100644 --- a/bolt/parse.py +++ b/bolt/parse.py @@ -268,7 +268,9 @@ def get_bolt_parsers( ), "bolt:import": AlternativeParser( [ - ImportLocationConstraint(delegate("resource_location_or_tag")), + ImportLocationConstraint( + DisableInterpolationParser(delegate("resource_location_or_tag")) + ), parse_python_import, ] ),