From 2d091dcc5b1250b2c9457f0ff34c0c997a6a0867 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 16 Aug 2020 21:35:56 -0500 Subject: Refactor parsers to enforce loads/dumps/decode_error requirement --- config_file/yaml_parser.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'config_file/yaml_parser.py') diff --git a/config_file/yaml_parser.py b/config_file/yaml_parser.py index 8d88881..fc4239a 100644 --- a/config_file/yaml_parser.py +++ b/config_file/yaml_parser.py @@ -1,21 +1,31 @@ +from typing import Type + from .base_parser import BaseParser class YamlParser(BaseParser): def __init__(self, file_contents: str): try: - from ruamel.yaml import YAML, YAMLError, round_trip_dump, round_trip_load - - yaml = YAML(typ="safe") - yaml.loads = round_trip_load - yaml.dumps = round_trip_dump - - super().__init__( - file_contents=file_contents, module=yaml, decode_error=YAMLError - ) + super().__init__(file_contents) except ImportError: raise ImportError( "It doesn't appear `ruamel.yaml` is installed, but a yaml " "file was attempted to be used. Install the `yaml` " "extra first with `pip install config-file[yaml]`." ) + + @property + def decode_error(self) -> Type[Exception]: + from ruamel.yaml import YAMLError + + return YAMLError + + def loads(self, contents: str) -> dict: + from ruamel.yaml import round_trip_load + + return round_trip_load(contents) + + def dumps(self, loaded_contents: dict) -> str: + from ruamel.yaml import round_trip_dump + + return round_trip_dump(loaded_contents) -- cgit v1.2.3