Settings, directory browser

2011-09-05 22:09:54 +02:00
parent 6430014c56
commit 1e36aeced3
13 changed files with 208 additions and 180 deletions
@@ -4,7 +4,6 @@ import os.path
 def isDict(object):
    return isinstance(object, dict)

-
 def mergeDicts(a, b):
    assert isDict(a), isDict(b)
    dst = a.copy()
@@ -16,7 +15,7 @@ def mergeDicts(a, b):
            if key not in current_dst:
                current_dst[key] = current_src[key]
            else:
-                if isDict(current_src[key]) and isDict(current_dst[key]) :
+                if isDict(current_src[key]) and isDict(current_dst[key]):
                    stack.append((current_dst[key], current_src[key]))
                else:
                    current_dst[key] = current_src[key]