aboutsummaryrefslogtreecommitdiffstats
path: root/config_file
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2020-06-20 15:30:11 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2020-06-20 15:30:11 -0500
commita4d252e5dbcf8d366707ab0c4ddac8a81963a801 (patch)
tree4cd1487bb27d96018f4763fa0d35a80e799ab2ed /config_file
parentChange path, parser, and contents to be properties (diff)
downloadconfig-file-a4d252e5dbcf8d366707ab0c4ddac8a81963a801.zip
Revert Python 3.5 support
Diffstat (limited to 'config_file')
-rw-r--r--config_file/config_file.py10
-rw-r--r--config_file/parsers/ini_parser.py6
-rw-r--r--config_file/parsers/json_parser.py4
-rw-r--r--config_file/utils.py14
4 files changed, 16 insertions, 18 deletions
diff --git a/config_file/config_file.py b/config_file/config_file.py
index d4131de..3af1083 100644
--- a/config_file/config_file.py
+++ b/config_file/config_file.py
@@ -55,9 +55,7 @@ class ConfigFile:
file_path = ".".join(file_parts)
if Path(file_path).is_dir():
- raise ValueError(
- "The specified config file ({}) is a directory.".format(file_path)
- )
+ raise ValueError(f"The specified config file ({file_path}) is a directory.")
return file_path
@@ -74,7 +72,7 @@ class ConfigFile:
return JsonParser(self.__contents)
else:
raise ValueError(
- "File path contains an unrecognized file type: {}".format(file_path)
+ f"File path contains an unrecognized file type: {file_path}"
)
def get(self, key: str, parse_types: bool = False, return_type=None, default=None):
@@ -91,6 +89,8 @@ class ConfigFile:
:param default: The default value to return if the value of the key is empty.
:return: The value of the key.
+
+ :raises ValueError: If the value is not able to be coerced into return_type
"""
if default is None:
key_value = self.__parser.get(key, parse_types=parse_types)
@@ -144,7 +144,7 @@ class ConfigFile:
if not Path(original_file_path).exists():
raise FileNotFoundError(
- "The {} file to restore to does not exist.".format(original_file_path)
+ f"The {original_file_path} file to restore to does not exist."
)
self.__path.expanduser().unlink()
diff --git a/config_file/parsers/ini_parser.py b/config_file/parsers/ini_parser.py
index 31b0dcf..2db1ae8 100644
--- a/config_file/parsers/ini_parser.py
+++ b/config_file/parsers/ini_parser.py
@@ -1,10 +1,10 @@
import configparser
from io import StringIO
+from config_file.exceptions import ParsingError
from config_file.parsers.base_parser import BaseParser
from config_file.parsers.parse_value import parse_value
from config_file.utils import split_on_dot
-from config_file.exceptions import ParsingError
class IniParser(BaseParser):
@@ -96,7 +96,7 @@ class IniParser(BaseParser):
if "." not in section_key:
if not self.parsed_content.has_section(section_key):
raise ValueError(
- "Cannot delete {} because it is not in the config file.".format(section_key)
+ f"Cannot delete {section_key} because it is not in the config file."
)
self.parsed_content.remove_section(section_key)
@@ -105,7 +105,7 @@ class IniParser(BaseParser):
section, key = split_on_dot(section_key, only_last_dot=True)
if key not in self.parsed_content[section]:
raise ValueError(
- "Cannot delete {section}.{key} because {key} is not in {section}.".format(section = section, key = key)
+ f"Cannot delete {section}.{key} because {key} is not in {section}."
)
self.parsed_content.remove_option(section, key)
diff --git a/config_file/parsers/json_parser.py b/config_file/parsers/json_parser.py
index 4d93ca3..10d5afc 100644
--- a/config_file/parsers/json_parser.py
+++ b/config_file/parsers/json_parser.py
@@ -7,10 +7,10 @@ from nested_lookup import (
nested_update,
)
+from config_file.exceptions import ParsingError
from config_file.parsers.base_parser import BaseParser
from config_file.parsers.parse_value import parse_value
from config_file.utils import split_on_dot
-from config_file.exceptions import ParsingError
class JsonParser(BaseParser):
@@ -78,7 +78,7 @@ class JsonParser(BaseParser):
result = result[key]
except TypeError:
raise ParsingError(
- "Cannot get {} because {} is not subscriptable.".format(key, key_for_error)
+ f"Cannot get {key} because {key_for_error} is not subscriptable."
)
else:
result = self.parsed_content[key]
diff --git a/config_file/utils.py b/config_file/utils.py
index 05c3a7a..9ed09b5 100644
--- a/config_file/utils.py
+++ b/config_file/utils.py
@@ -1,8 +1,8 @@
-from pathlib import Path
-from typing import Union
+from pathlib import PurePath
+from typing import Type, Union
-def split_on_dot(line: Union[str, Path], only_last_dot=False):
+def split_on_dot(line: Union[str, Type[PurePath]], only_last_dot=False):
"""
Split a string on the dot character (.).
@@ -11,17 +11,15 @@ def split_on_dot(line: Union[str, Path], only_last_dot=False):
:raises ValueError: if the line does not have a dot.
"""
- if isinstance(line, Path):
+ if isinstance(line, PurePath):
line = str(line)
if "." not in line:
- raise ValueError(
- "The given string does not have a dot to split on: {}".format(line)
- )
+ raise ValueError(f"The given string does not have a dot to split on: {line}")
return line.rsplit(".", 1) if only_last_dot else line.split(".")
-def read_file(path: Union[str, Path]):
+def read_file(path: Union[str, Type[PurePath]]):
with open(path, "r") as file:
return file.read()