kkpyutil 1.34.0__py3-none-any.whl → 1.36.0__py3-none-any.whl

{kkpyutil-1.34.0.dist-info → kkpyutil-1.36.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kkpyutil
-Version: 1.34.0
+Version: 1.36.0
 Summary: Building blocks for sysadmin and DevOps
 Home-page: https://github.com/kakyoism/kkpyutil/
 License: MIT

kkpyutil-1.36.0.dist-info/RECORD

@@ -0,0 +1,7 @@
+kkpyutil.py,sha256=MqHZaKpYvSnqTQafDF-Ij7-ojZAjjWGlJaC3uf2EdpU,107979
+kkpyutil_helper/windows/kkttssave.ps1,sha256=xa3-WzqNh2rGYlOx_I4ewOuCE94gkTO5cEwYH0M67_0,446
+kkpyutil_helper/windows/kkttsspeak.ps1,sha256=7WUUHMmjTQroUWA2Mvdt4JtSt475nZUHQx-qP-7rS6o,305
+kkpyutil-1.36.0.dist-info/LICENSE,sha256=uISevGnCxB5QOU0ftbofN75_yUtd6E2h_MWE1zqagC8,1065
+kkpyutil-1.36.0.dist-info/METADATA,sha256=nOnCODHLaO5XgSQJOGaRrKcIJOoOkIINmiGaY_U1Hk8,1136
+kkpyutil-1.36.0.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+kkpyutil-1.36.0.dist-info/RECORD,,

kkpyutil.py

@@ -314,6 +314,14 @@ def format_error(expected, got):
 {log_got}"""
 
 
+def format_xml(elem, indent='    ', encoding='utf-8'):
+    import xml.etree.ElementTree as ET
+    from xml.dom import minidom
+    rough_string = ET.tostring(elem, encoding)
+    reparsed = minidom.parseString(rough_string)
+    return reparsed.toprettyxml(indent=indent)
+
+
 def throw(err_cls, detail, advice):
     raise err_cls(f"""
 {format_brief('Detail', detail if isinstance(detail, list) else [detail])}
@@ -1731,6 +1739,7 @@ def copy_file(src, dst, isdstdir=False, keepmeta=False):
         copyfunc(src, dst)
     except shutil.SameFileError:
         glogger.warning(f'source and destination are identical. will SKIP: {osp.abspath(src)} -> {osp.abspath(dst)}.')
+    return dst if not isdstdir else osp.join(dst, osp.basename(src))
 
 
 def move_file(src, dst, isdstdir=False):
@@ -1751,6 +1760,7 @@ def move_file(src, dst, isdstdir=False):
 - detail: {e}
 - advice: manually remove source
 - ignored""")
+    return dst if not isdstdir else osp.join(dst, osp.basename(src))
 
 
 def compare_dirs(dir1, dir2, ignoreddirpatterns=(), ignoredfilepatterns=(), showdiff=True):
@@ -2876,6 +2886,10 @@ def remove_unsupported_dict_keys(mydict: dict, supported_keys: set):
     return mydict
 
 
+
+
+
+
 def _test():
     print(say('hello'))
 

kkpyutil-1.34.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-kkpyutil.py,sha256=jy1wwUFR7xKpzvpAurANOjQKJefygOAcbPMDqR81xOw,107566
-kkpyutil_helper/windows/kkttssave.ps1,sha256=xa3-WzqNh2rGYlOx_I4ewOuCE94gkTO5cEwYH0M67_0,446
-kkpyutil_helper/windows/kkttsspeak.ps1,sha256=7WUUHMmjTQroUWA2Mvdt4JtSt475nZUHQx-qP-7rS6o,305
-kkpyutil-1.34.0.dist-info/LICENSE,sha256=uISevGnCxB5QOU0ftbofN75_yUtd6E2h_MWE1zqagC8,1065
-kkpyutil-1.34.0.dist-info/METADATA,sha256=Lm476tLYWIKATu3ouX5VtNXGUGD2y9vPBz-eAvzP-Hg,1136
-kkpyutil-1.34.0.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-kkpyutil-1.34.0.dist-info/RECORD,,