From 0b8e8b5a4c481074aebaaf79b4e21d84ecf3a535 Mon Sep 17 00:00:00 2001 From: "Lex Darlog (DRL)" <3897975+Lex-DRL@users.noreply.github.com> Date: Fri, 25 Jul 2025 03:06:23 +0500 Subject: [PATCH] refactor --- funcs_common.py | 2 +- funcs_dict_add_any.py | 4 ++-- funcs_dict_add_string.py | 4 ++-- funcs_dict_from_text.py | 4 ++-- funcs_dict_preview.py | 4 ++-- funcs_formatter.py | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/funcs_common.py b/funcs_common.py index c05db3e..4e71b7b 100644 --- a/funcs_common.py +++ b/funcs_common.py @@ -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). diff --git a/funcs_dict_add_any.py b/funcs_dict_add_any.py index 67b4d63..aa00f3d 100644 --- a/funcs_dict_add_any.py +++ b/funcs_dict_add_any.py @@ -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 diff --git a/funcs_dict_add_string.py b/funcs_dict_add_string.py index 902d003..a396d32 100644 --- a/funcs_dict_add_string.py +++ b/funcs_dict_add_string.py @@ -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) diff --git a/funcs_dict_from_text.py b/funcs_dict_from_text.py index 0a22aba..5ed9bac 100644 --- a/funcs_dict_from_text.py +++ b/funcs_dict_from_text.py @@ -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] = { diff --git a/funcs_dict_preview.py b/funcs_dict_preview.py index 0285211..de1ab0e 100644 --- a/funcs_dict_preview.py +++ b/funcs_dict_preview.py @@ -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() ] diff --git a/funcs_formatter.py b/funcs_formatter.py index 46d4646..9b36a37 100644 --- a/funcs_formatter.py +++ b/funcs_formatter.py @@ -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}")