updated CHANGELOG and version

chimpler · May 6, 2016 · b4273f3 · b4273f3
1 parent f311fba
commit b4273f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
-# Version 0.3.xx (TBA)
+# Version 0.3.26 
 
-* Implemented self-referential subsitutions
+* Implemented self-referential substitutions and +=. PR [#81]
 
 # Version 0.3.25
 

diff --git a/pyhocon/config_parser.py b/pyhocon/config_parser.py
@@ -309,7 +309,7 @@ def _fixup_self_references(config):
                                 raise ConfigSubstitutionException("Property {variable} cannot be substituted. Check for cycles.".format(
                                     variable=substitution.variable))
                             value = previous_item if len(prop_path) == 1 else previous_item.get(".".join(prop_path[1:]))
-                            (_, _, current_item) = ConfigParser._do_substitute(substitution, value)
+                            _, _, current_item = ConfigParser._do_substitute(substitution, value)
                     previous_item = current_item
 
                 if len(history) == 1:  # special case, when self optional referencing without existing
@@ -408,8 +408,8 @@ def resolve_substitutions(config):
                     if not is_optional_resolved and substitution.optional:
                         resolved_value = None
 
-                    unresolved, new_subsitutions, _ = ConfigParser._do_substitute(substitution, resolved_value, is_optional_resolved)
-                    substitutions.extend(new_subsitutions)
+                    unresolved, new_substitutions, _ = ConfigParser._do_substitute(substitution, resolved_value, is_optional_resolved)
+                    substitutions.extend(new_substitutions)
                     substitutions.remove(substitution)
 
             ConfigParser._final_fixup(config)

diff --git a/setup.py b/setup.py
@@ -29,7 +29,7 @@ def run_tests(self):
 
 setup(
     name='pyhocon',
-    version='0.3.25',
+    version='0.3.26',
     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.',