YAML var files: Convert dicts inside lists to DotDicts

Fixes #4418.
robotframework · Aug 9, 2022 · 794ba5d · 794ba5d
1 parent e9b1aee
commit 794ba5d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/atest/robot/variables/yaml_variable_file.robot b/atest/robot/variables/yaml_variable_file.robot
@@ -20,6 +20,12 @@ Non-ASCII strings
 Dictionary is dot-accessible
     Check Test Case    ${TESTNAME}
 
+Nested dictionary is dot-accessible
+    Check Test Case    ${TESTNAME}
+
+Dictionary inside list is dot-accessible
+    Check Test Case    ${TESTNAME}
+
 YAML file in PYTHONPATH
     Check Test Case    ${TESTNAME}
 

diff --git a/atest/testdata/variables/valid.yaml b/atest/testdata/variables/valid.yaml
@@ -14,3 +14,9 @@ dict:
   key with spaces: value with spaces
 nested dict:
   dict: *alias
+list with dict:
+  - scalar
+  - key: value
+  - dict: *alias
+    nested:
+      - leaf: value
diff --git a/atest/testdata/variables/yaml_variable_file.robot b/atest/testdata/variables/yaml_variable_file.robot
@@ -35,10 +35,17 @@ Non-ASCII strings
 Dictionary is dot-accessible
     ${DICT.a}                1
     ${DICT.b}                ${2}
-    ${NESTED DICT.dict}      ${DICT}
+
+Nested dictionary is dot-accessible
+    ${NESTED DICT.dict}      ${EXPECTED DICT}
     ${NESTED DICT.dict.a}    1
     ${NESTED DICT.dict.b}    ${2}
 
+Dictionary inside list is dot-accessible
+    ${LIST WITH DICT[1].key}               value
+    ${LIST WITH DICT[2].dict}              ${EXPECTED DICT}
+    ${LIST WITH DICT[2].nested[0].leaf}    value
+
 YAML file in PYTHONPATH
     ${YAML FILE IN PYTHONPATH}    ${TRUE}
 

diff --git a/src/robot/variables/filesetter.py b/src/robot/variables/filesetter.py
@@ -85,7 +85,9 @@ def _load_yaml(self, stream):
 
     def _dot_dict(self, value):
         if is_dict_like(value):
-            value = DotDict((n, self._dot_dict(v)) for n, v in value.items())
+            return DotDict((k, self._dot_dict(v)) for k, v in value.items())
+        if is_list_like(value):
+            return [self._dot_dict(v) for v in value]
         return value