From 59eeb1321fbad41dce7c971778e37ac1943fda3b Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Wed, 5 Aug 2020 20:39:28 -0500 Subject: Redo package to have a flat package structure By having a flat package structure like this, it'll avoid exposing packages and things we don't want to be exposed. --- config_file/toml_parser.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 config_file/toml_parser.py (limited to 'config_file/toml_parser.py') diff --git a/config_file/toml_parser.py b/config_file/toml_parser.py new file mode 100644 index 0000000..1c7f8a7 --- /dev/null +++ b/config_file/toml_parser.py @@ -0,0 +1,28 @@ +try: + import tomlkit + + TOML_AVAILABLE = True +except ImportError: + TOML_AVAILABLE = False + +from config_file.exceptions import MissingDependencyError + +from .base_parser import BaseParser + + +class TomlParser(BaseParser): + def __init__(self, file_contents: str): + if not TOML_AVAILABLE: + raise MissingDependencyError( + "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 From 19d23dc13636b30f6282e8b3f02b659bcdb2bb11 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Wed, 5 Aug 2020 21:48:08 -0500 Subject: Remove MissingDependencyError in favor of ImportError --- config_file/toml_parser.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config_file/toml_parser.py') diff --git a/config_file/toml_parser.py b/config_file/toml_parser.py index 1c7f8a7..fc12ab3 100644 --- a/config_file/toml_parser.py +++ b/config_file/toml_parser.py @@ -5,7 +5,6 @@ try: except ImportError: TOML_AVAILABLE = False -from config_file.exceptions import MissingDependencyError from .base_parser import BaseParser @@ -13,7 +12,7 @@ from .base_parser import BaseParser class TomlParser(BaseParser): def __init__(self, file_contents: str): if not TOML_AVAILABLE: - raise MissingDependencyError( + 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]`." -- cgit v1.2.3 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