transformations(wordSubstituteSet): use *args for tuple unpacking (#81)

globaldothealth · Aug 9, 2023 · a877b0a · a877b0a
1 parent 30884c2
commit a877b0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/adtl/transformations.py b/adtl/transformations.py
@@ -20,7 +20,7 @@ def textIfNotNull(field, return_val):
     return return_val if field not in [None, ""] else None
 
 
-def wordSubstituteSet(value, params):
+def wordSubstituteSet(value, *params):
     """
     For a value that can have multiple words, use substitutions from params.
     params is a list of 2-tuples, in the form
@@ -35,7 +35,7 @@ def wordSubstituteSet(value, params):
     """
     out = []
     for i in params:
-        if not isinstance(i, (tuple, list)):
+        if not isinstance(i, (tuple, list)) or not all(isinstance(s, str) for s in i):
             raise ValueError("wordSubstituteSet: params item not a tuple or list")
         sub_map = dict(params)
         for match, subst in sub_map.items():

diff --git a/tests/test_transformations.py b/tests/test_transformations.py
@@ -16,22 +16,21 @@ def test_isNotNull(test_input, expected):
         (
             (
                 "Metilprednisolona - Dexametasona - Fluticasona",
-                [
-                    ("Metilprednisolona", "Methylprednisolone"),
-                    ("Fluticasona", "Fluticasone"),
-                    ("Dexametasona", "Dexamethasone"),
-                ],
+                ("Metilprednisolona", "Methylprednisolone"),
+                ("Fluticasona", "Fluticasone"),
+                ("Dexametasona", "Dexamethasone"),
             ),
             ["Dexamethasone", "Fluticasone", "Methylprednisolone"],
         ),
         (
             (
                 "Hidrocortisona - Fluticasona",
-                [("Hidrocortisona", "Hydrocortisone"), ("Fluticasona", "Fluticasone")],
+                ("Hidrocortisona", "Hydrocortisone"),
+                ("Fluticasona", "Fluticasone"),
             ),
             ["Fluticasone", "Hydrocortisone"],
         ),
-        ((("Hidrocortisona - Fluticasona"), [("Cortisona", "Cortisone")]), None),
+        (("Hidrocortisona - Fluticasona", ("Cortisona", "Cortisone")), None),
     ],
 )
 def test_wordSubstituteSet(test_input, expected):