ParUtils 1.2.6__py3-none-any.whl → 1.2.8__py3-none-any.whl

parutils/__init__.py

@@ -51,5 +51,6 @@ from .dq import file_match
 from .dq import del_dup_list
 from .dq import find_dup_list
 
-from .testing import ttry
-from .testing import Wtry
+from .te import Wtry
+from .te import ttry
+from .te import try_bool

parutils/changelog.py

@@ -1,6 +1,12 @@
-__VERSION__ = '1.2.6'
-# Wtry context manager 
-# truncate middle by default
+__VERSION__ = '1.2.8'
+# try_bool
+
+# __VERSION__ = '1.2.7'
+# # file.load_txt - clean_lst
+
+# __VERSION__ = '1.2.6'
+# # Wtry context manager 
+# # truncate middle by default
 
 # __VERSION__ = '1.2.5'
 # # Faster file.load_txt

parutils/file.py

@@ -63,17 +63,21 @@ def list_files(in_dir,
     return out
 
 
-def load_txt(in_path, list_out=True):
+def load_txt(in_path, list_out=True, clean_lst=True):
     """Loads a text file
 
     - list_out: if True, a list is output, each element representing a line of the file. If False, a string is output.
+    - clean_lst: if True, the last element of the output list is deleted when void.
     """
 
     with open(in_path, 'r', encoding='utf-8') as f:
         data = f.read()
 
     if list_out:
-        return data.split('\n')
+        out = data.split('\n')
+        if out and clean_lst and out[-1] == '':
+            del out[-1]
+        return out
     else:
         return data
 

parutils/strg.py

@@ -78,7 +78,7 @@ def hash512(in_str: str, length=10):
     always outputs the same string for the same input string"""
     import hashlib
 
-    out = hashlib.sha512(in_str.encode('utf-8')).hexdigest()[:length]
+    out = hashlib.sha512(str(in_str).encode('utf-8')).hexdigest()[:length]
     return out
 
 

parutils/{testing.py → te.py}

@@ -23,6 +23,13 @@ class Wtry:
             raise Exception(s)
 
 
+def try_bool(func, *args, **kwargs):
+    try:
+        return True, func(*args, **kwargs)
+    except Exception as e:
+        return False, e
+
+
 def ttry(f, e_ref, *args, **kwargs):
 
     exception_occured = False

parutils/tests/logging/test_logging.py

@@ -25,11 +25,11 @@ def t_log_every():
 
     log_path = u.get_logger().log_path
     logs = u.load_txt(log_path)
-    assert len(logs) == 14 
+    assert len(logs) == 13 
     logs0 = u.close_logger().logs
     assert "log_elt_5" in logs0[2]
     logs = u.load_txt(log_path)
-    assert len(logs) == 17 
+    assert len(logs) == 16
     logs_txt = u.load_txt(log_path, False)
     assert "log_elt_5" in logs_txt
     assert len(u.g.logs) == 3

parutils/tests/test_msc.py

@@ -2,6 +2,15 @@ import parutils as u
 
 
 def test_msc():
+
+    res = u.try_bool(ok_func, 'arg1', 'arg2', kwarg1='val1', kwarg2='val2')
+    assert res[0]
+    assert res[1] == "ok: ('arg1', 'arg2'), {'kwarg1': 'val1', 'kwarg2': 'val2'}"
+
+    res = u.try_bool(nok_func_args, 'arg1', 'arg2', kwarg1='val1', kwarg2='val2')
+    assert not res[0]
+    assert str(res[1]) == "test_error: ('arg1', 'arg2'), {'kwarg1': 'val1', 'kwarg2': 'val2'}"
+
     lst = ['key1=value1', 'key2=value2']
     out = u.list_to_dict(lst)
 
@@ -31,8 +40,12 @@ def nok_func():
     raise Exception('test_error')
 
 
-def ok_func():
-    pass
+def nok_func_args(*args, **kwargs):
+    raise Exception(f'test_error: {args}, {kwargs}')
+
+
+def ok_func(*args, **kwargs):
+    return f'ok: {args}, {kwargs}'
 
 
 if __name__ == '__main__':  # pragma: no cover

{parutils-1.2.6.dist-info → parutils-1.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ParUtils
-Version: 1.2.6
+Version: 1.2.8
 Summary: This package contains a bunch of Python utilities developed for Support, Test and Automation IT Engineers
 Author-email: Paul ARNAUD <paularnaud2@gmail.com>
 Project-URL: Homepage, https://github.com/paularnaud2/ParUtils

{parutils-1.2.6.dist-info → parutils-1.2.8.dist-info}/RECORD

@@ -1,12 +1,12 @@
-parutils/__init__.py,sha256=-TvW6Rx9DMsbIqj7USEasNmR1n7oAp6r80Y48mbN7BE,1461
-parutils/changelog.py,sha256=ZJS3qHv4kiwmEp92b7_HzBD05TqFSe5BE3y1FRR1BzA,2026
+parutils/__init__.py,sha256=vC7wsFBrPkFXar4gRk06FVGPVPUL8nOU9WfjuyuoNUQ,1477
+parutils/changelog.py,sha256=CFQM8ci_B1RqwMHp9BOxD9g3mER2qS7JWz-Fq1TPmO0,2127
 parutils/csvl.py,sha256=JgJPnN8IPrdMD8OOlPtDSEhJULMkPkqnDnB-D4z9F-E,2871
 parutils/dq.py,sha256=kdvzOo5FLCumXagY05kGSseYlbR-zvjjmsMtGVliVc8,2302
-parutils/file.py,sha256=prENNneiQmKKRS5BxGH7tN23x5e6XSfyrhpO0lOLs0g,2739
+parutils/file.py,sha256=-oDnjMqIxL0jyMWOU5LRDnPcoXl5S9VEMp0xiLHcZ9w,2933
 parutils/g.py,sha256=n99gQbLs2rmszBYw_wy43P4iQo3lqpBHz3-Q7sm9n_U,11
 parutils/msc.py,sha256=6Yx-VJss0xRqQAiuVURu0L4oDHkcsF7T5EK6eXrm9TQ,745
-parutils/strg.py,sha256=feFJON6qpiR8LV1954poO8i20-3wWdDNlpT_KtqIEAk,5879
-parutils/testing.py,sha256=fC9wbJSSQXqW9RGPaQpp67VQKRFLoncS3s1bXL7qkuY,1227
+parutils/strg.py,sha256=iBlPWeBupZ556KjuYM_ubb8v7Tjd46KN4sjVW9tzXao,5884
+parutils/te.py,sha256=At5TUG78w7qgnd0T2heu1HL6PH4fPQkXWDcwx6VtGig,1376
 parutils/wrap.py,sha256=PqMyKodgEjWDXoIVZZXRaBSdkGFL5OWmVJttl2Crrg8,421
 parutils/logging/__init__.py,sha256=rSNpgjuYer-Hhn6zKzKwKSn_KfcajEXlk6cJnPC9eJU,461
 parutils/logging/cl.py,sha256=NCLuxLHvqRTypZlAgwnegkByLTnTirKntnwguJHBelA,2086
@@ -20,13 +20,13 @@ parutils/tests/conftest.py,sha256=iIyQvgVV8GzUwJ0tlN2KUJHX5ZO7lp8bKFK3VmRx4DU,48
 parutils/tests/test_csv.py,sha256=vHs_CT1oLWAGkRvKdF-Ilz62MczEDKqQfmmQe-nt-Wg,671
 parutils/tests/test_dq.py,sha256=Qb5lldyg-UAOvNbViNLnchkG93v_-DQ96XkIPgOIXWo,967
 parutils/tests/test_file.py,sha256=iYaSm0YU7qQIq9p7Sea4KPdoKRpqWcbgbkZG4u0DR_s,1031
-parutils/tests/test_msc.py,sha256=swmidUNkCAH1WobJxX-6pXdJ5PwAzCTZp9wFV_-YlY4,1036
+parutils/tests/test_msc.py,sha256=XLImwN-GS1qCBABgCxs2ZY9QGbtmNhul-tIZqiWUL0Q,1559
 parutils/tests/logging/check_log.py,sha256=Se-EuWuwxlcksjIkLZU4d77-o3eyFdppJCxGJ-GcorY,2332
-parutils/tests/logging/test_logging.py,sha256=bceIEO7W7rhLm_YrqRcXSA0NaQIAU1x6XZMWU3uNeFk,5260
+parutils/tests/logging/test_logging.py,sha256=C5lciMZkRi1LL0J6r_KIK2cwld3LmKKA413eZXEd3rI,5259
 parutils/tests/string/check_log.py,sha256=m2RRJIorA6jg7uV_8nxWfKHUFZ98YPDn-DqzcTw3cQ0,211
 parutils/tests/string/test_string.py,sha256=9709GQ8iw4MnRHgBuGK9Ed_uuk9rL8EDVXdK0_la9zQ,2140
-parutils-1.2.6.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-parutils-1.2.6.dist-info/METADATA,sha256=UV6ct-37viTm6FMvb0Q2BT8VRiaBdWrc9ydROgYZJAw,6868
-parutils-1.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-parutils-1.2.6.dist-info/top_level.txt,sha256=1MDobUcroeYEvdupZCAFvA5hJjm7LSDUV5A4jHySNis,9
-parutils-1.2.6.dist-info/RECORD,,
+parutils-1.2.8.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+parutils-1.2.8.dist-info/METADATA,sha256=JpAuN7VpbgHrTic7pawQbAD5JYtWB1eYPFMGpREg88Q,6868
+parutils-1.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+parutils-1.2.8.dist-info/top_level.txt,sha256=1MDobUcroeYEvdupZCAFvA5hJjm7LSDUV5A4jHySNis,9
+parutils-1.2.8.dist-info/RECORD,,