aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2020-07-29 21:33:54 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2020-07-29 21:33:54 -0500
commit03811338b3bc9d07d491454ba5646ba2dd912463 (patch)
treeda6e5a3551f5fb535e53c334b864676486aca115
parentUse ruamel.yaml for yaml parser (diff)
downloadconfig-file-03811338b3bc9d07d491454ba5646ba2dd912463.zip
Fix `get`, `set`, `delete` and `has` in BaseParser
-rw-r--r--config_file/parsers/base_parser.py39
-rw-r--r--config_file/parsers/toml_parser.py1
2 files changed, 27 insertions, 13 deletions
diff --git a/config_file/parsers/base_parser.py b/config_file/parsers/base_parser.py
index 09fbbbf..546450c 100644
--- a/config_file/parsers/base_parser.py
+++ b/config_file/parsers/base_parser.py
@@ -1,4 +1,5 @@
from typing import Any
+from types import ModuleType
from config_file.exceptions import MissingKeyError, ParsingError
from config_file.nested_lookup import get_occurrence_of_key
@@ -8,7 +9,9 @@ from .abstract_parser import AbstractParser
class BaseParser(AbstractParser):
- def __init__(self, file_contents: str, module, decode_error):
+ def __init__(
+ self, file_contents: str, module: ModuleType, decode_error: Exception
+ ):
super().__init__(file_contents)
self.__module = module
self.__decode_error = decode_error
@@ -39,9 +42,9 @@ class BaseParser(AbstractParser):
for key in split_keys:
key_causing_error = key
result = result[key]
- except TypeError:
+ except (KeyError, TypeError):
raise ParsingError(
- f"Cannot get {search_key} because "
+ f"Cannot `get` {search_key} because "
f"{key_causing_error} is not subscriptable."
)
@@ -59,9 +62,13 @@ class BaseParser(AbstractParser):
content_reference[key] = value
return
- content_reference = content_reference[key]
+ try:
+ content_reference = content_reference[key]
+ except KeyError:
+ content_reference[key] = {}
+ content_reference = content_reference[key]
- def delete(self, key) -> None:
+ def delete(self, key: str) -> None:
try:
if "." not in key:
del self.parsed_content[key]
@@ -69,18 +76,26 @@ class BaseParser(AbstractParser):
indexes = split_on_dot(key)
indexes_length = len(indexes)
- ref = self.parsed_content
+ content_reference = self.parsed_content
for index, key in enumerate(indexes):
if index == indexes_length - 1:
- del ref[key]
+ del content_reference[key]
break
- ref = ref[key]
- except KeyError:
- raise MissingKeyError(f"The specified key '{key}' was not found.")
+ content_reference = content_reference[key]
+ except (KeyError, TypeError):
+ raise MissingKeyError(f"The specified key '{key}' to delete was not found.")
def stringify(self) -> str:
return self.__module.dumps(self.parsed_content)
- def has(self, search_key: str) -> bool:
- return get_occurrence_of_key(self.parsed_content, key=search_key) > 0
+ def has(self, search_key: str, wild: bool = False) -> bool:
+ if wild:
+ return get_occurrence_of_key(self.parsed_content, key=search_key) > 0
+
+ try:
+ self.get(search_key)
+ return True
+ except (KeyError, ParsingError):
+ return False
+
diff --git a/config_file/parsers/toml_parser.py b/config_file/parsers/toml_parser.py
index d369003..58e20b9 100644
--- a/config_file/parsers/toml_parser.py
+++ b/config_file/parsers/toml_parser.py
@@ -9,7 +9,6 @@ from config_file.exceptions import MissingDependencyError
from .base_parser import BaseParser
-
class TomlParser(BaseParser):
def __init__(self, file_contents: str):
if not TOML_AVAILABLE: