refactor
This commit is contained in:
+1
-1
@@ -60,7 +60,7 @@ def _raise_from_errors_dict(
|
||||
raise KeyError(msg)
|
||||
|
||||
|
||||
def _verify_input_dict(input_dict: _t.Dict[str, _T] = None) -> _t.Dict[str, _T]:
|
||||
def _verify_input_dict_into_new(input_dict: _t.Dict[str, _T] = None) -> _t.Dict[str, _T]:
|
||||
"""
|
||||
Verify input dict to have only valid keys. Raises errors if invalid ones found.
|
||||
Always returns a new dict instance (shallow copy if non-empty dict passed).
|
||||
|
||||
@@ -7,7 +7,7 @@ import typing as _t
|
||||
|
||||
from frozendict import deepfreeze as _deepfreeze
|
||||
|
||||
from .funcs_common import _raise_from_errors_dict, _validate_key, _verify_input_dict
|
||||
from .funcs_common import _raise_from_errors_dict, _validate_key, _verify_input_dict_into_new
|
||||
|
||||
|
||||
def set_dict_any_type_item(
|
||||
@@ -15,7 +15,7 @@ def set_dict_any_type_item(
|
||||
# unique_id: str = None,
|
||||
) -> _t.Tuple[_t.Dict[str, _t.Any]]:
|
||||
"""Update/append an item of any type to the dict."""
|
||||
out_dict: _t.Dict[str, _t.Any] = _verify_input_dict(in_dict)
|
||||
out_dict: _t.Dict[str, _t.Any] = _verify_input_dict_into_new(in_dict)
|
||||
if value is None:
|
||||
return (_deepfreeze(in_dict), ) # No need to create another dict instance if it's already frozen
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import typing as _t
|
||||
from frozendict import deepfreeze as _deepfreeze
|
||||
|
||||
from .enums import T as _T
|
||||
from .funcs_common import _raise_from_errors_dict, _validate_key, _verify_input_dict
|
||||
from .funcs_common import _raise_from_errors_dict, _validate_key, _verify_input_dict_into_new
|
||||
|
||||
|
||||
def set_dict_string(
|
||||
@@ -16,7 +16,7 @@ def set_dict_string(
|
||||
# unique_id: str = None,
|
||||
) -> _t.Tuple[_t.Dict[str, _t.Union[_T, str]]]:
|
||||
"""Update/append a string to the dict."""
|
||||
out_dict: _t.Dict[str, _t.Union[_T, str]] = _verify_input_dict(in_dict)
|
||||
out_dict: _t.Dict[str, _t.Union[_T, str]] = _verify_input_dict_into_new(in_dict)
|
||||
errors_dict: _t.Dict[_t.Any, str] = dict()
|
||||
name = _validate_key(name, errors_dict)
|
||||
_raise_from_errors_dict(errors_dict)
|
||||
|
||||
@@ -8,7 +8,7 @@ import typing as _t
|
||||
from frozendict import frozendict as _frozendict, deepfreeze as _deepfreeze
|
||||
|
||||
from .enums import T as _T
|
||||
from .funcs_common import _show_text_on_node, _raise_from_errors_dict, _validate_key, _verify_input_dict
|
||||
from .funcs_common import _show_text_on_node, _raise_from_errors_dict, _validate_key, _verify_input_dict_into_new
|
||||
|
||||
|
||||
def _return_line_raw(line_raw: str, line_stripped:str) -> str:
|
||||
@@ -61,7 +61,7 @@ def parse_dict_from_text(
|
||||
multiline_str: str, strip_lines=True,
|
||||
show: bool = True, in_dict: _t.Dict[str, _T] = None, unique_id: str = None
|
||||
) -> _t.Tuple[_t.Dict[str, _T]]:
|
||||
out_dict: _t.Dict[str, _T] = _verify_input_dict(in_dict)
|
||||
out_dict: _t.Dict[str, _T] = _verify_input_dict_into_new(in_dict)
|
||||
|
||||
errors_dict: _t.Dict[_t.Any, str] = dict()
|
||||
new_dict: _t.Dict[str, str] = {
|
||||
|
||||
@@ -7,7 +7,7 @@ import typing as _t
|
||||
|
||||
from pprint import pformat as _pformat
|
||||
|
||||
from .funcs_common import _show_text_on_node, _verify_input_dict
|
||||
from .funcs_common import _show_text_on_node, _verify_input_dict_into_new
|
||||
|
||||
|
||||
def _to_regular_dict_recursive_copy(input_dict: dict = None) -> dict:
|
||||
@@ -32,7 +32,7 @@ def _preview_single_entry(key: str, value) -> str:
|
||||
|
||||
|
||||
def _preview_message(input_dict: dict = None):
|
||||
input_dict = _to_regular_dict_recursive_copy(_verify_input_dict(input_dict))
|
||||
input_dict = _to_regular_dict_recursive_copy(_verify_input_dict_into_new(input_dict))
|
||||
parts: _t.List[str] = [
|
||||
_preview_single_entry(k, v) for k, v in input_dict.items()
|
||||
]
|
||||
|
||||
+2
-2
@@ -7,7 +7,7 @@ import typing as _t
|
||||
|
||||
import sys as _sys
|
||||
|
||||
from .funcs_common import _show_text_on_node, _verify_input_dict
|
||||
from .funcs_common import _show_text_on_node, _verify_input_dict_into_new
|
||||
|
||||
|
||||
_RECURSION_LIMIT = max(int(_sys.getrecursionlimit()), 10) # You can externally monkey-patch it... but if it blows up, your fault 🤷🏻♂️
|
||||
@@ -45,7 +45,7 @@ def formatter(
|
||||
template: str, recursive: bool = False, format_dict: _t.Dict[str, _t.Any] = None,
|
||||
show: bool = True, unique_id: str = None
|
||||
) -> _t.Tuple[str]:
|
||||
format_dict = _verify_input_dict(format_dict)
|
||||
format_dict = _verify_input_dict_into_new(format_dict)
|
||||
if not isinstance(template, str):
|
||||
raise TypeError(f"Not a string: {template!r}")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user