Use setdefaultwip-overlaps

2 files changed, 7 insertions, 10 deletions

diff --git a/ybd/app.py b/ybd/app.py
index c2e4830..7139049 100644
--- a/ybd/app.py
+++ b/ybd/app.py
@@ -140,8 +140,8 @@ def setup(args):
     config['defdir'] = os.getcwd()
     config['extsdir'] = os.path.join(config['defdir'], 'extensions')
     base_dir = os.environ.get('XDG_CACHE_HOME') or os.path.expanduser('~')
-    if config.get('base', None) is None:
-        config['base'] = os.path.join(base_dir, config['directories']['base'])
+    config.setdefault('base',
+        os.path.join(base_dir, config['directories']['base']))
     for directory, path in config.get('directories', {}).items():
         try:
             if config.get(directory) is None:
diff --git a/ybd/definitions.py b/ybd/definitions.py
index 38ba995..3a5ee12 100644
--- a/ybd/definitions.py
+++ b/ybd/definitions.py
@@ -163,14 +163,11 @@ class Definitions(object):
         the same as 'path' but replacing '/' by '-'
 
         '''
-        if definition.get('path', None) is None:
-            definition['path'] = definition.pop('morph',
-                                                definition.get('name', name))
-            if definition['path'] == 'ERROR':
-                app.exit(definition, 'ERROR: no path, no name?')
-        if definition.get('name') is None:
-            definition['name'] = definition['path']
-        definition['name'] = definition['name'].replace('/', '-')
+        definition.setdefault('path',
+                definition.pop('morph', definition.get('name', name)))
+        if definition['path'] == 'ERROR':
+            app.exit(definition, 'ERROR: no path, no name?')
+        definition.setdefault('name', definition['path']).replace('/', '-')
         if definition['name'] == app.config['target']:
             app.config['target'] = definition['path']