From b4273f3b23077a4ec34e7a48b969ebc4536dd049 Mon Sep 17 00:00:00 2001 From: Francois Dang Ngoc Date: Thu, 5 May 2016 22:48:25 -0400 Subject: [PATCH] updated CHANGELOG and version --- CHANGELOG.md | 4 ++-- pyhocon/config_parser.py | 6 +++--- setup.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f75182b..578d4334 100644 --- 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 index a0299122..e2c25239 100644 --- 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 index 8f8ea25a..d2476d30 100755 --- 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.',