From d2f3161dac2313e4109ba2159fdc0d43e50506f8 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Thu, 6 Aug 2020 09:43:44 -0500 Subject: Test extras parsers & move imports inside those parsers --- config_file/toml_parser.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'config_file/toml_parser.py') diff --git a/config_file/toml_parser.py b/config_file/toml_parser.py index fc12ab3..d3cf226 100644 --- a/config_file/toml_parser.py +++ b/config_file/toml_parser.py @@ -1,27 +1,18 @@ -try: - import tomlkit - - TOML_AVAILABLE = True -except ImportError: - TOML_AVAILABLE = False - - from .base_parser import BaseParser class TomlParser(BaseParser): def __init__(self, file_contents: str): - if not TOML_AVAILABLE: + try: + import tomlkit + from tomlkit.exceptions import ParseError + + super().__init__( + file_contents=file_contents, module=tomlkit, decode_error=ParseError, + ) + except ImportError: raise ImportError( "It doesn't appear `tomlkit` is installed, but a toml " "file was attempted to be used. Install the `toml` " "extra first with `pip install config-file[toml]`." ) - - super().__init__( - file_contents=file_contents, - module=tomlkit, - # tomlkit doesn't expose it's exceptions, but - # it's parsing error is a subclass of ValueError - decode_error=ValueError, - ) -- cgit v1.2.3