encommon 0.8.2__py3-none-any.whl → 0.10.0__py3-none-any.whl

encommon/config/config.py

@@ -20,6 +20,7 @@ from .params import Params
 from .paths import ConfigPaths
 from ..crypts import Crypts
 from ..types import merge_dicts
+from ..types import setate
 
 if TYPE_CHECKING:
     from ..utils.common import PATHABLE
@@ -124,7 +125,16 @@ class Config:
         :returns: Value for the attribute from class instance.
         """
 
-        return deepcopy(self.__cargs)
+        returned: dict[str, Any] = {}
+
+        cargs = deepcopy(self.__cargs)
+
+        items = cargs.items()
+
+        for key, value in items:
+            setate(returned, key, value)
+
+        return deepcopy(returned)
 
 
     @property

encommon/config/params.py

@@ -18,7 +18,7 @@ from ..crypts import CryptsParams
 
 class ConfigParams(BaseModel, extra='forbid'):
     """
-    Process and validate the common configuration parameters.
+    Process and validate the core configuration parameters.
 
     :param paths: Complete or relative path to config paths.
     :param data: Keyword arguments passed to Pydantic model.
@@ -31,7 +31,7 @@ class ConfigParams(BaseModel, extra='forbid'):
 
 class LoggerParams(BaseModel, extra='forbid'):
     """
-    Process and validate the common configuration parameters.
+    Process and validate the core configuration parameters.
 
     :param stdo_level: Minimum level for the message to pass.
     :param file_level: Minimum level for the message to pass.
@@ -48,7 +48,7 @@ class LoggerParams(BaseModel, extra='forbid'):
 
 class Params(BaseModel, extra='forbid'):
     """
-    Process and validate the common configuration parameters.
+    Process and validate the core configuration parameters.
 
     :param enconfig: Configuration for the Config instance.
     :param enlogger: Configuration for the Logger instance.

encommon/config/test/test_config.py

@@ -16,6 +16,8 @@ from ..params import Params
 from ... import ENPYRWS
 from ... import PROJECT
 from ...crypts import Crypts
+from ...types import inrepr
+from ...types import instr
 from ...utils import load_sample
 from ...utils import prep_sample
 
@@ -48,18 +50,24 @@ def test_Config(
         '_Config__crypts']
 
 
-    assert 1 <= repr(config).find(
-        'config.Config object')
+    assert inrepr(
+        'config.Config object',
+        config)
 
     assert hash(config) > 0
 
-    assert 1 <= str(config).find(
-        'config.Config object')
+    assert instr(
+        'config.Config object',
+        config)
 
 
-    assert 'ConfigFiles' in str(config.files)
+    assert instr(
+        'files.ConfigFiles object',
+        config.files)
 
-    assert 'ConfigPaths' in str(config.paths)
+    assert instr(
+        'paths.ConfigPaths object',
+        config.paths)
 
     assert len(config.cargs) == 1
 

encommon/config/test/test_files.py

@@ -14,6 +14,8 @@ from pytest import fixture
 from . import SAMPLES
 from ..files import ConfigFile
 from ..files import ConfigFiles
+from ...types import inrepr
+from ...types import instr
 
 
 
@@ -54,13 +56,15 @@ def test_ConfigFile(
         'config']
 
 
-    assert 1 <= repr(file).find(
-        'files.ConfigFile object')
+    assert inrepr(
+        'files.ConfigFile object',
+        file)
 
     assert hash(file) > 0
 
-    assert 1 <= str(file).find(
-        'files.ConfigFile object')
+    assert instr(
+        'files.ConfigFile object',
+        file)
 
 
     assert file.path.name == 'config.yml'
@@ -87,13 +91,15 @@ def test_ConfigFiles(
         '_ConfigFiles__merged']
 
 
-    assert 1 <= repr(files).find(
-        'files.ConfigFiles object')
+    assert inrepr(
+        'files.ConfigFiles object',
+        files)
 
     assert hash(files) > 0
 
-    assert 1 <= str(files).find(
-        'files.ConfigFiles object')
+    assert instr(
+        'files.ConfigFiles object',
+        files)
 
 
     assert len(files.paths) == 2

encommon/config/test/test_logger.py

@@ -18,6 +18,8 @@ from ..logger import Message
 from ..params import LoggerParams
 from ...times.common import UNIXMPOCH
 from ...times.common import UNIXSPOCH
+from ...types import inrepr
+from ...types import instr
 from ...utils import strip_ansi
 
 
@@ -75,13 +77,15 @@ def test_Message() -> None:
         '_Message__fields']
 
 
-    assert repr(message)[:20] == (
-        'Message(level="info"')
+    assert inrepr(
+        'Message(level="info"',
+        message)
 
     assert hash(message) > 0
 
-    assert str(message)[:20] == (
-        'Message(level="info"')
+    assert instr(
+        'Message(level="info"',
+        message)
 
 
     assert message.level == 'info'
@@ -146,13 +150,15 @@ def test_Logger(
         '_Logger__logr_file']
 
 
-    assert 1 <= repr(logger).find(
-        'logger.Logger object')
+    assert inrepr(
+        'logger.Logger object',
+        logger)
 
     assert hash(logger) > 0
 
-    assert 1 <= str(logger).find(
-        'logger.Logger object')
+    assert instr(
+        'logger.Logger object',
+        logger)
 
 
     assert logger.stdo_level == 'info'

encommon/config/test/test_paths.py

@@ -16,6 +16,8 @@ from ..paths import ConfigPath
 from ..paths import ConfigPaths
 from ... import ENPYRWS
 from ... import PROJECT
+from ...types import inrepr
+from ...types import instr
 from ...utils import load_sample
 from ...utils import prep_sample
 
@@ -57,13 +59,15 @@ def test_ConfigPath(
         'config']
 
 
-    assert 1 <= repr(path).find(
-        'paths.ConfigPath object')
+    assert inrepr(
+        'paths.ConfigPath object',
+        path)
 
     assert hash(path) > 0
 
-    assert 1 <= str(path).find(
-        'paths.ConfigPath object')
+    assert instr(
+        'paths.ConfigPath object',
+        path)
 
 
     assert 'test' in path.path.name
@@ -89,13 +93,15 @@ def test_ConfigPaths(
         '_ConfigPaths__merged']
 
 
-    assert 1 <= repr(paths).find(
-        'paths.ConfigPaths object')
+    assert inrepr(
+        'paths.ConfigPaths object',
+        paths)
 
     assert hash(paths) > 0
 
-    assert 1 <= str(paths).find(
-        'paths.ConfigPaths object')
+    assert instr(
+        'paths.ConfigPaths object',
+        paths)
 
 
     assert len(paths.paths) == 2

encommon/conftest.py

@@ -43,9 +43,8 @@ def config_factory(
     config_log = f'{tmp_path}/config.log'
 
     cargs = {
-        'enlogger': {
-            'file_path': config_log,
-            'file_level': 'info'}}
+        'enlogger/file_path': config_log,
+        'enlogger/file_level': 'info'}
 
     return Config(
         files=f'{tmp_path}/config.yml',

encommon/crypts/params.py

@@ -13,7 +13,7 @@ from pydantic import BaseModel
 
 class CryptsParams(BaseModel, extra='forbid'):
     """
-    Process and validate the common configuration parameters.
+    Process and validate the core configuration parameters.
 
     :param phrases: Passphrases that are used in operations.
     :param data: Keyword arguments passed to Pydantic model.

encommon/crypts/test/test_crypts.py

@@ -13,6 +13,8 @@ from pytest import raises
 
 from ..crypts import Crypts
 from ..params import CryptsParams
+from ...types import inrepr
+from ...types import instr
 
 
 
@@ -51,13 +53,15 @@ def test_Crypts(
         '_Crypts__phrases']
 
 
-    assert 1 <= repr(crypts).find(
-        'crypts.Crypts object')
+    assert inrepr(
+        'crypts.Crypts object',
+        crypts)
 
     assert hash(crypts) > 0
 
-    assert 1 <= str(crypts).find(
-        'crypts.Crypts object')
+    assert instr(
+        'crypts.Crypts object',
+        crypts)
 
 
     assert len(crypts.phrases) == 2

encommon/crypts/test/test_hashes.py

@@ -8,6 +8,8 @@ is permitted, for more information consult the project license file.
 
 
 from ..hashes import Hashes
+from ...types import inrepr
+from ...types import instr
 
 
 
@@ -25,13 +27,15 @@ def test_Hashes() -> None:
         '_Hashes__string']
 
 
-    assert 1 <= repr(hashes).find(
-        'hashes.Hashes object')
+    assert inrepr(
+        'hashes.Hashes object',
+        hashes)
 
     assert hash(hashes) > 0
 
-    assert 1 <= str(hashes).find(
-        'hashes.Hashes object')
+    assert instr(
+        'hashes.Hashes object',
+        hashes)
 
 
     assert hashes.string == 'string'

encommon/times/test/test_duration.py

@@ -8,6 +8,7 @@ is permitted, for more information consult the project license file.
 
 
 from ..duration import Duration
+from ...types import inrepr
 from ...types.strings import COMMAS
 
 
@@ -28,8 +29,9 @@ def test_Duration() -> None:
         '_Duration__groups']
 
 
-    assert repr(durate)[:23] == (
-        'Duration(seconds=95401.')
+    assert inrepr(
+        'Duration(seconds=95401',
+        durate)
 
     assert hash(durate) > 0
 

encommon/times/test/test_timers.py

@@ -14,6 +14,8 @@ from pytest import fixture
 from pytest import raises
 
 from ..timers import Timers
+from ...types import inrepr
+from ...types import instr
 
 
 
@@ -54,13 +56,15 @@ def test_Timers(
         '_Timers__cache']
 
 
-    assert 1 <= repr(timers).find(
-        'timers.Timers object')
+    assert inrepr(
+        'timers.Timers object',
+        timers)
 
     assert hash(timers) > 0
 
-    assert 1 <= str(timers).find(
-        'timers.Timers object')
+    assert instr(
+        'timers.Timers object',
+        timers)
 
 
     assert timers.timers == {'one': 1}

encommon/times/test/test_times.py

@@ -12,6 +12,8 @@ from ..common import UNIXEPOCH
 from ..common import UNIXHPOCH
 from ..common import UNIXMPOCH
 from ..times import Times
+from ...types import inrepr
+from ...types import instr
 
 
 
@@ -32,13 +34,15 @@ def test_Times() -> None:
         '_Times__hashed']
 
 
-    assert repr(times)[:23] == (
-        "Times('1970-01-01T00:00")
+    assert inrepr(
+        "Times('1970-01-01T00:00",
+        times)
 
     assert hash(times) > 0
 
-    assert str(times)[:23] == (
-        '1970-01-01T00:00:00.000')
+    assert instr(
+        '1970-01-01T00:00:00.000',
+        times)
 
 
     assert int(times) == 0

encommon/times/test/test_window.py

@@ -15,6 +15,8 @@ from pytest import mark
 from ..window import Window
 from ..window import window_croniter
 from ..window import window_interval
+from ...types import inrepr
+from ...types import instr
 
 if TYPE_CHECKING:
     from ..common import PARSABLE
@@ -58,13 +60,15 @@ def test_Window(
         '_Window__walked']
 
 
-    assert 1 <= repr(window).find(
-        'window.Window object')
+    assert inrepr(
+        'window.Window object',
+        window)
 
     assert hash(window) > 0
 
-    assert 1 <= str(window).find(
-        'window.Window object')
+    assert instr(
+        'window.Window object',
+        window)
 
 
     assert window.schedule == '* * * * *'

encommon/types/__init__.py

@@ -10,12 +10,24 @@ is permitted, for more information consult the project license file.
 from .dicts import merge_dicts
 from .dicts import sort_dict
 from .empty import Empty
+from .notate import delate
+from .notate import getate
+from .notate import setate
+from .strings import hasstr
+from .strings import inrepr
+from .strings import instr
 from .strings import striplower
 
 
 
 __all__ = [
+    'delate',
     'Empty',
+    'getate',
+    'hasstr',
+    'inrepr',
+    'instr',
     'merge_dicts',
+    'setate',
     'sort_dict',
     'striplower']