fixed a bug with yaml parser (yamale 2.1)

k4cg · Jun 20, 2020 · 95327c4 · 95327c4
1 parent 0f1927a
commit 95327c4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.flake8 b/.flake8
@@ -6,7 +6,7 @@ ignore =
     # ignore `self`, `cls` markers of flake8-annotations>=2.0
     ANN101,ANN102
 
-exclude = .git,__pycache__,_OLD,_TEST,build,dist,.tox,*_cache,.eggs
+exclude = .git,__pycache__,_OLD,_TEST,build,dist,.tox,*_cache,.eggs,.venv,venv
     setup.py
     docs
     examples

diff --git a/HISTORY.md b/HISTORY.md
@@ -4,6 +4,11 @@
 
 add upcoming unreleased modiications here
 
+## 2.4.2
+
+* Fixed
+  * config yaml parser when `yamale>=2.1` is installed.
+
 ## 2.4.1
 
 * Fixed

diff --git a/nichtparasoup/config/__init__.py b/nichtparasoup/config/__init__.py
@@ -43,7 +43,8 @@ def parse_yaml_file(file_path: str) -> Dict[str, Any]:
     if not _schema:
         _schema = yamale.make_schema(_SCHEMA_FILE, parser='ruamel')
     _data = yamale.make_data(file_path, parser='ruamel')
-    config = yamale.validate(_schema, _data, strict=True)[0][0]  # type: Dict[str, Any]
+    yamale.validate(_schema, _data, strict=True)
+    config = _data[0][0]  # type: Dict[str, Any]
     config.setdefault('logging', dict())
     config['logging'].setdefault('level', 'INFO')
     for config_crawler in config['crawlers']: