config: mkdir -p $(basename)

Author: kba

ocrd/ocrd/config.py

@@ -4,17 +4,20 @@
 from yaml import safe_load, safe_dump
 
 from ocrd_models import OcrdConfig
-from ocrd_utils import XDG_CONFIG_HOME, VERSION
+from ocrd_utils import VERSION
+import ocrd_utils
 from ocrd_validators import OcrdConfigValidator
 from ocrd_models.ocrd_config import DEFAULT_CONFIG
 
-def load_config_file():
+def load_config_file(basedir=None):
     """
     Load the configuration file
     """
-    fpath = Path(XDG_CONFIG_HOME, 'ocrd', 'config.yml')
+    if not basedir:
+        basedir = ocrd_utils.XDG_CONFIG_HOME
+    fpath = Path(basedir, 'ocrd', 'config.yml')
     if not fpath.parent.exists():
-        fpath.parent.mkdir()
+        fpath.parent.mkdir(parents=True)
     obj = DEFAULT_CONFIG
     if not fpath.exists():
         with open(str(fpath), 'w', encoding='utf-8') as f_out:

tests/test_ocrd_config.py

@@ -2,19 +2,16 @@
 from unittest import mock
 from pathlib import Path
 
-import ocrd_utils
+from ocrd_utils import pushd_popd
+from ocrd.config import load_config_file
 
 def test_config_loading():
-    XDG_CONFIG_HOME_before = ocrd_utils.XDG_CONFIG_HOME
-    with ocrd_utils.pushd_popd(tempdir=True) as tempdir:
-        ocrd_utils.XDG_CONFIG_HOME = tempdir
+    with pushd_popd(tempdir=True) as tempdir:
         Path('ocrd').mkdir()
         with open('ocrd/config.yml', 'w', encoding='utf-8') as f:
             f.write('resource_location: cache\n')
-        from ocrd.config import load_config_file
-        obj = load_config_file()
+        obj = load_config_file(tempdir)
         assert obj.dump() == {'resource_location': 'cache'}
-    ocrd_utils.XDG_CONFIG_HOME = XDG_CONFIG_HOME_before
 
 if __name__ == '__main__':
     main(__file__)