From 69e07f7bb63697d8f4c24e59701a0f7e2f3010ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Fri, 5 Jan 2024 15:03:15 +0100
Subject: [PATCH] MAINT: use $ sign for in and out
---
src/caoscrawler/converters.py | 2 +-
src/caoscrawler/scanner.py | 2 +-
unittests/test_directories/test_transformers/cfood.yml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/caoscrawler/converters.py b/src/caoscrawler/converters.py
index 51dc5615..7150db75 100644
--- a/src/caoscrawler/converters.py
+++ b/src/caoscrawler/converters.py
@@ -446,7 +446,7 @@ class Converter(object, metaclass=ABCMeta):
match = SINGLE_VAR_RE.match(transformer["out"])
if match is None:
raise RuntimeError("'out' of the transformer definition must specify a single"
- " variable name")
+ f" variable name. It was {transformer['out']}")
print(f"set {match.group('varname')} to {out_value}")
values[match.group('varname')] = out_value
diff --git a/src/caoscrawler/scanner.py b/src/caoscrawler/scanner.py
index 5b1d9e51..25f72e56 100644
--- a/src/caoscrawler/scanner.py
+++ b/src/caoscrawler/scanner.py
@@ -211,7 +211,7 @@ def create_transformer_registry(definition: dict):
}
# Load modules and associate classes:
- for key, value in transformer_registry.items():
+ for key, value in transformer_def.items():
module = importlib.import_module(value["package"])
registry[key] = getattr(module, value["function"])
return registry
diff --git a/unittests/test_directories/test_transformers/cfood.yml b/unittests/test_directories/test_transformers/cfood.yml
index 84066a4c..9208d62c 100644
--- a/unittests/test_directories/test_transformers/cfood.yml
+++ b/unittests/test_directories/test_transformers/cfood.yml
@@ -11,7 +11,7 @@ RootDir:
transform:
MakeDayLong:
in: $day_short
- out: day_long # no dollar sign here, because this is a variable name and no expression
+ out: $day_long
functions:
- ifelse: # name of the function
match: Mon # match is one specific argument
@@ -21,7 +21,7 @@ RootDir:
then: Tuesday
TestSplit:
in: $day_short
- out: day_split # no dollar sign here, because this is a variable name and no expression
+ out: $day_split
functions:
- split:
marker: o
--
GitLab