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

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/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,18 @@ 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 .strings import hasstr
+from .strings import inrepr
+from .strings import instr
 from .strings import striplower
 
 
 
 __all__ = [
     'Empty',
+    'hasstr',
+    'inrepr',
+    'instr',
     'merge_dicts',
     'sort_dict',
     'striplower']

encommon/types/strings.py

@@ -7,6 +7,10 @@ is permitted, for more information consult the project license file.
 
 
 
+from typing import Any
+
+
+
 COMMAS = ', '
 COMMAD = ','
 
@@ -33,3 +37,74 @@ def striplower(
     """
 
     return value.strip().lower()
+
+
+
+def hasstr(
+    haystack: str,
+    needle: str,
+) -> bool:
+    """
+    Return the boolean indicating if needle is in haystack.
+
+    Example
+    -------
+    >>> haystack = 'barfoobaz'
+    >>> needle = 'foo'
+    >>> hasstr(haystack, needle)
+    True
+
+    :param haystack: Full string which may contain needle.
+    :param needle: Substring which may be within haystack.
+    :returns: Boolean indicating if needle is in haystack.
+    """
+
+    return needle in haystack
+
+
+
+def inrepr(
+    needle: str,
+    haystack: Any,  # noqa: ANN401
+) -> bool:
+    """
+    Return the boolean indicating if needle is in haystack.
+
+    Example
+    -------
+    >>> class MyClass: pass
+    >>> haystack = MyClass()
+    >>> needle = 'MyClass'
+    >>> inrepr(needle, haystack)
+    True
+
+    :param needle: Substring which may be within haystack.
+    :param haystack: Object which is inspected for needle.
+    :returns: Boolean indicating if needle is in haystack.
+    """
+
+    return hasstr(repr(haystack), needle)
+
+
+
+def instr(
+    needle: str,
+    haystack: Any,  # noqa: ANN401
+) -> bool:
+    """
+    Return the boolean indicating if needle is in haystack.
+
+    Example
+    -------
+    >>> class MyClass: pass
+    >>> haystack = MyClass()
+    >>> needle = 'MyClass'
+    >>> instr(needle, haystack)
+    True
+
+    :param needle: Substring which may be within haystack.
+    :param haystack: Object which is inspected for needle.
+    :returns: Boolean indicating if needle is in haystack.
+    """
+
+    return hasstr(str(haystack), needle)

encommon/types/test/test_strings.py

@@ -7,6 +7,9 @@ is permitted, for more information consult the project license file.
 
 
 
+from ..strings import hasstr
+from ..strings import inrepr
+from ..strings import instr
 from ..strings import striplower
 
 
@@ -17,3 +20,42 @@ def test_striplower() -> None:
     """
 
     assert striplower(' Foo ') == 'foo'
+
+
+
+def test_hasstr() -> None:
+    """
+    Perform various tests associated with relevant routines.
+    """
+
+    assert hasstr('abc', 'a')
+    assert hasstr('abc', 'b')
+    assert hasstr('abc', 'c')
+
+
+
+def test_inrepr() -> None:
+    """
+    Perform various tests associated with relevant routines.
+    """
+
+    class MyClass:
+        pass
+
+    item = MyClass()
+
+    assert inrepr('MyClass', item)
+
+
+
+def test_instr() -> None:
+    """
+    Perform various tests associated with relevant routines.
+    """
+
+    class MyClass:
+        pass
+
+    item = MyClass()
+
+    assert instr('MyClass', item)

encommon/version.txt

@@ -1 +1 @@
-0.8.2
+0.9.0

{encommon-0.8.2.dist-info → encommon-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: encommon
-Version: 0.8.2
+Version: 0.9.0
 Summary: Enasis Network Common Library
 License: MIT
 Classifier: Programming Language :: Python :: 3

{encommon-0.8.2.dist-info → encommon-0.9.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 encommon/__init__.py,sha256=VoXUcphq-gcXCraaU47EtXBftF6UVuQPMGr0fuCTt9A,525
 encommon/conftest.py,sha256=J2__qc7WP8oZkMLXRCw9qlBaaHSx1HhkIkKkGnHHCAU,1810
 encommon/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-encommon/version.txt,sha256=zrmywDr7dp3zseUYUgxOF5jpozE6HF___LBU_vXW1vs,6
+encommon/version.txt,sha256=nYyU8a0-qWseKsSRT9pMuTx2tKPg2Mxt2JdtbAsifRU,6
 encommon/config/__init__.py,sha256=i0G48SrSk_QgZ-xOMYtsllPT2Y06i7j29XEkqUH0wZ8,859
 encommon/config/common.py,sha256=QGrbA3OlQ0nta6cOyEu0dw8li9UlV_J7Yn3rhZLm7mw,2099
 encommon/config/config.py,sha256=F3ufzcymHznSHhXMwB3kHcExoPDLSoSk3-vQb0WIseU,4802
@@ -11,17 +11,17 @@ encommon/config/params.py,sha256=xCCg9dy19SqyA4YeOsuLdQbnpwYuD-XOh-mLQCmRpAI,180
 encommon/config/paths.py,sha256=eR0BQC_TaKHu1dQGrC8o69l6dEqDoI8JS9IHmPrsJ68,2535
 encommon/config/test/__init__.py,sha256=i0JAeRcM-0YH2StGfwpaDbZV9dVribNSgFDcYcPPay8,313
 encommon/config/test/test_common.py,sha256=K9KiAfbMBXaoYErW10X1AigFs8wNNNOxKG8QV6IYJdA,1069
-encommon/config/test/test_config.py,sha256=tORznpD6dLZKBxxIsMHYvoJb7x6G6zQgE1rZeRjLxjE,2325
-encommon/config/test/test_files.py,sha256=wFGtmtIknPlNoy683aBS5jee1GJCQorRpFs2IjITVOs,2240
-encommon/config/test/test_logger.py,sha256=yPNSASMZdmEVGXZhFhSMLs4KGbDl5ky2oyVUNNnJA8o,5131
-encommon/config/test/test_paths.py,sha256=X4TAcP9wgSs_MyXJ-cP_MOvNaSu8j71skPukUZcF59A,2578
+encommon/config/test/test_config.py,sha256=POup-M0oIuCSceUDV1tkSCmv0bwKQS_wgFzesUgIgNM,2440
+encommon/config/test/test_files.py,sha256=qJgavSxTxilHOnGzfF6fBpViOmKFGcBdupOIRhDsXuk,2295
+encommon/config/test/test_logger.py,sha256=uzun7HFk5XgiuEvq-50nJtQ_poJbu8BxvsJjeOOFzqk,5188
+encommon/config/test/test_paths.py,sha256=jCrSEnPkZprsJSvolsfTKoyuYqxqyQdDymL9yk3elvQ,2633
 encommon/crypts/__init__.py,sha256=UsGEitz8rWa7DQF3iAxEbTUAbdiEnE87LSuRs4OBeAQ,371
 encommon/crypts/crypts.py,sha256=fCYEOlq5vp34L9yPT-oMhvI-8o6FRoPViM7aZShB1_Y,3540
 encommon/crypts/hashes.py,sha256=bpQf2-Ma5SdMaEWP2nL1_9rtEQmTE0XTdDvSD-fQ9Mk,3075
 encommon/crypts/params.py,sha256=7hh7a7VtsQNqcZHeSkQI_V4JLfoe0D-JyqrIvtoq86c,590
 encommon/crypts/test/__init__.py,sha256=PjrnBYT0efyvbaGeNx94dm3tP3EVHUHSVs-VGeLEv5g,218
-encommon/crypts/test/test_crypts.py,sha256=j-GkmBtk_08APwrGtB-oc50vkepFr42txGtLZr_X1Z0,2651
-encommon/crypts/test/test_hashes.py,sha256=ZbnmIYbQkGhcmQF2E5tFW4iBHteI45ePJBzvCpYFya0,1125
+encommon/crypts/test/test_crypts.py,sha256=MnMZPGWSN-vV3iA1s4OsZ72dqHII1a244fSPDILXfVE,2706
+encommon/crypts/test/test_hashes.py,sha256=JYpPit7ISv6u-5-HbC3wSCxuieySDLKawgnE7-xHgTY,1180
 encommon/times/__init__.py,sha256=Gyi34zy6po35P2sNvbwnsOQg4kU6KOodfygLhRdCEgU,638
 encommon/times/common.py,sha256=T-Bt8P1EBn-TOEF0Bd0kUJMr6qEFCnHOLiYqgJE9mqk,3635
 encommon/times/duration.py,sha256=LTROiKcRXvPcs2Gz9KaB5Cmxo9NXd3TcMo5-jnTxPo0,10794
@@ -31,19 +31,19 @@ encommon/times/times.py,sha256=xuPtFR2Gkr_AFPfspqGq3cU67rfZr0xvKcQvlw2Q-xQ,9696
 encommon/times/window.py,sha256=CA9zIdi0ad-WiC03zG_T_WilWoEwATISVBOF1Jqtf4o,7975
 encommon/times/test/__init__.py,sha256=PjrnBYT0efyvbaGeNx94dm3tP3EVHUHSVs-VGeLEv5g,218
 encommon/times/test/test_common.py,sha256=r0vwJ-2SiwVOvSyEB0JkpWfsAeLvSCEhuLaYE1rk0VY,2059
-encommon/times/test/test_duration.py,sha256=38BIpnK2dU0ZMhpxujNjc8WM0DAmPVi0IgQ9IzMW0Ss,4161
+encommon/times/test/test_duration.py,sha256=ofCBdQ4-tOKP5W5U2xyTaZrCVvD-dWEgnYoCvZ99MuA,4189
 encommon/times/test/test_parse.py,sha256=iIKanoqqQMxpXVxo9HNwY7oscQB1HzXU9QId0puoGd4,4055
-encommon/times/test/test_timers.py,sha256=cJ-jreqMyiqPi9OoaaFAeDr7FZYKvng7etUvcekjSP0,3073
-encommon/times/test/test_times.py,sha256=fDW3JroUM-tySqsvq25htbW2p1cYBNZr1W7E39sZUSE,1691
-encommon/times/test/test_window.py,sha256=FNOopZvzOfbM2D7GRystRnG05ffpoqH58HEx5jh0BXM,5409
-encommon/types/__init__.py,sha256=l2WKtDs6uC9I3dIGnrzJvz-4JLEETUJOfT509XyMQWs,420
+encommon/times/test/test_timers.py,sha256=bOfajUjnpZJItTvs1UOWuZxWT-HGI6oyi3svA8ZFYhg,3128
+encommon/times/test/test_times.py,sha256=vxEtXI9gYFlWnBLsyPyi17a96MJzgcI79SCy8U1Co8I,1748
+encommon/times/test/test_window.py,sha256=Px6Qfg_uVp34TLV-OiOJ2rJU1vCqqTFKeme2CceCoZQ,5464
+encommon/types/__init__.py,sha256=eR_8b9lxMqfudqI63RCuQvbNV5YhWIBdVFQ71bA7B3s,544
 encommon/types/dicts.py,sha256=lC2FmPzMEj9L73jUjf3o6OVQ-LqK_3gp5nBwYibdGfo,2265
 encommon/types/empty.py,sha256=n5y5maXkcM3xNYNYGK6iqvk98ivQSeguaedwc0HoMv4,2739
-encommon/types/strings.py,sha256=7HWZxTmQXIOxk1-hM4Ex4Jp2veZNZbj-8YmYXFOPFJ0,632
+encommon/types/strings.py,sha256=oFPRrJuK3ey5FHeHoUTPoinpYlwuJmcbi0UQjRupEM4,2175
 encommon/types/test/__init__.py,sha256=PjrnBYT0efyvbaGeNx94dm3tP3EVHUHSVs-VGeLEv5g,218
 encommon/types/test/test_dicts.py,sha256=jOXE2NTfZg2dtmgR2Hv9uaAI90kKT-91bX6jWAu-5Xs,2678
 encommon/types/test/test_empty.py,sha256=4GiBs3xulfTnJ5xuGm2hM_PRcHspYEj5tAaLd4Trhyc,973
-encommon/types/test/test_strings.py,sha256=gYq9B-ekRKw_j6pZiHJiQnkXHiH5fwK4CDdGnpqdtAs,406
+encommon/types/test/test_strings.py,sha256=AgDXL3qiKcl1Fzx7lVsnW1ejEB13fXKpvELwG48OcSw,1084
 encommon/utils/__init__.py,sha256=FJzSgfXddDXrxnencV6W4MArr3xQPEcfwrPVtMqwDHE,927
 encommon/utils/common.py,sha256=N5CAo5rHIIvXzmOWwbO7R4xTYnGDqB9OYXGh0ignc_g,1355
 encommon/utils/match.py,sha256=XvmmMKQ1q8_21zzPGuVvaZf6XwHXPZn4IWIYBEqVCQM,2471
@@ -56,8 +56,8 @@ encommon/utils/test/test_match.py,sha256=QagKpTFdRo23-Y55fSaJrSMpt5jIebScKbz0h8t
 encommon/utils/test/test_paths.py,sha256=o7AF73jz09Mny21IsRG8vbB20mDH_oVmQFuxoSCLiOc,1919
 encommon/utils/test/test_sample.py,sha256=sHAeWOL1mchTGYGQaFK_A3Z28tThuULumm9kQebnIdk,1710
 encommon/utils/test/test_stdout.py,sha256=TA7xQuFoPZUYW2l00e04MGp4P9gHkkVxVflvPlhpQXg,4878
-encommon-0.8.2.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
-encommon-0.8.2.dist-info/METADATA,sha256=0nzhKz9kM4Z9KVidJLbRX3Yq5I-CwS5qE5kO_35v1Oo,2917
-encommon-0.8.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-encommon-0.8.2.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
-encommon-0.8.2.dist-info/RECORD,,
+encommon-0.9.0.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
+encommon-0.9.0.dist-info/METADATA,sha256=38RmRSOI8IR586MLJgOAZ5_cXSKWS8gWzx0taPp0BM4,2917
+encommon-0.9.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+encommon-0.9.0.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
+encommon-0.9.0.dist-info/RECORD,,