kkpyutil 1.34.0__tar.gz → 1.36.0__tar.gz

{kkpyutil-1.34.0 → kkpyutil-1.36.0}/PKG-INFO

@@ -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.34.0 → kkpyutil-1.36.0}/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 → kkpyutil-1.36.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kkpyutil"
-version = "1.34.0"
+version = "1.36.0"
 description = "Building blocks for sysadmin and DevOps"
 authors = ["Beinan Li <li.beinan@gmail.com>"]
 maintainers = ["Beinan Li <li.beinan@gmail.com>"]