bumped version to 0.2.7

chimpler · Apr 14, 2015 · a053445 · a053445
1 parent 3957bdb
commit a053445
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+
+## Version 0.2.7
+
+* fixed dict merge. PR [#14]
+
 ## Version 0.2.6
 
 * fixed string substitutions. PR [#13]

diff --git a/pyhocon/config_tree.py b/pyhocon/config_tree.py
@@ -27,7 +27,7 @@ def _merge_config_tree(self, a, b):
         """
         for key, value in b.items():
             # if key is in both a and b and both values are dictionary then merge it otherwise override it
-            if key in a.keys() and isinstance(a[key], ConfigTree) and isinstance(a[key], ConfigTree):
+            if key in a and isinstance(a[key], ConfigTree) and isinstance(a[key], ConfigTree):
                 self._merge_config_tree(a[key], b[key])
             else:
                 a[key] = value

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='pyhocon',
-    version='0.2.6',
+    version='0.2.7',
     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.',
     keywords='hocon parser',