Merge remote-tracking branch 'origin/master' into topic/self-reference

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 * Implemented self-referential subsitutions
 
+# Version 0.3.25
+
+* ConfigValue.transform: do not wrap lists. PR [#76]
+
 # Version 0.3.24
 
 * Use recursive merging when concatenating objects. PR [#74]

pyhocon/config_parser.py

@@ -363,7 +363,7 @@ def _do_substitute(substitution, resolved_value, is_optional_resolved=True):
             if transformation is None and not is_optional_resolved:
                 result = config_values.overriden_value
             else:
-                result = transformation[0] if isinstance(transformation, list) else transformation
+                result = transformation
 
             if result is None:
                 del config_values.parent[config_values.key]
@@ -453,7 +453,7 @@ def __init__(self, expr=None):
 
     def postParse(self, instring, loc, token_list):
         config_values = ConfigValues(token_list, instring, loc)
-        return config_values.transform()
+        return [config_values.transform()]
 
 
 class ConfigTreeParser(TokenConverter):

pyhocon/config_tree.py

@@ -386,7 +386,7 @@ def format_str(v):
                     main_index += 1
                     sublist_result.append(token)
                 result.extend(sublist_result)
-            return [result]
+            return result
         else:
             if len(tokens) == 1:
                 return tokens[0]

setup.py

@@ -29,7 +29,7 @@ def run_tests(self):
 
 setup(
     name='pyhocon',
-    version='0.3.24',
+    version='0.3.25',
     description='HOCON parser for Python',
     long_description='pyhocon is a HOCON parser for Python. Additionally we provide a tool (pyhocon) to convert any HOCON '
                      'content into json, yaml and properties format.',

tests/test_config_parser.py

@@ -1671,3 +1671,21 @@ def test_object_concat(self):
         assert config.get_int('o1.foo.c', default=42) == 42
         assert config.get_int('o3.foo.a') == 1
         assert config.get_int('o3.foo.c') == 4
+
+    def test_issue_75(self):
+        config = ConfigFactory.parse_string(
+            """base : {
+              bar: ["a"]
+            }
+
+            sub : ${base} {
+              baz: ${base.bar} ["b"]
+            }
+
+            sub2: ${sub}
+            """
+        )
+
+        assert config.get_list('base.bar') == ["a"]
+        assert config.get_list('sub.baz') == ["a", "b"]
+        assert config.get_list('sub2.baz') == ["a", "b"]