Merge branch 'master' into version/2.x

Author: moomoohk

.gitignore

@@ -8,4 +8,5 @@
 venv_39
 .idea/
 dpath.egg-info/
-dist/
+dist/
+tests/.hypothesis

dpath/util.py

@@ -9,6 +9,7 @@
 MERGE_ADDITIVE = (1 << 2)
 MERGE_TYPESAFE = (1 << 3)
 
+
 def __safe_path__(path, separator):
     '''
     Given a path and separator, return a tuple of segments. If path is
@@ -171,7 +172,7 @@ def f(obj, pair, results):
     results = dpath.segments.fold(obj, f, [])
 
     if len(results) == 0:
-        if default  is not _DEFAULT_SENTINAL:
+        if default is not _DEFAULT_SENTINAL:
             return default
 
         raise KeyError(glob)