Mercurial > hgrepos > Python > libs > ConfigMix

changeset 9:6835a5663008

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FIX: Style
author Franz Glasner <f.glasner@feldmann-mg.com>
date Wed, 09 Mar 2016 11:09:33 +0100
parents 7090c295c940
children 58af59d5af40
files configmix/__init__.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configmix/__init__.py	Wed Mar 09 09:05:41 2016 +0100
+++ b/configmix/__init__.py	Wed Mar 09 11:09:33 2016 +0100
@@ -35,7 +35,7 @@
     result = deepcopy(a)
     for k, v in b.iteritems():
         if k in result and isinstance(result[k], dict):
-                result[k] = dict_merge(result[k], v)
+            result[k] = dict_merge(result[k], v)
         else:
             result[k] = deepcopy(v)
     return result
@@ -48,7 +48,7 @@
 
     """
     if isinstance(user, dict) and isinstance(default, dict):
-        for k,v in default.items():
+        for k, v in default.items():
             if k not in user:
                 user[k] = v
             else: