kkpyutil 1.30.0__tar.gz → 1.32.0__tar.gz

{kkpyutil-1.30.0 → kkpyutil-1.32.0}/PKG-INFO

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

{kkpyutil-1.30.0 → kkpyutil-1.32.0}/kkpyutil.py

@@ -521,11 +521,11 @@ def save_plist(path, my_map, binary=False):
         plistlib.dump(my_map, fp, fmt=fmt)
 
 
-def substitute_keywords_in_file(file, str_map, useliteral=False):
-    with open(file) as f:
+def substitute_keywords_in_file(file, str_map, useliteral=False, encoding=TXT_CODEC):
+    with open(file, encoding=encoding) as f:
         original = f.read()
         updated = substitute_keywords(original, str_map, useliteral)
-    with open(file, 'w') as f:
+    with open(file, 'w', encoding=encoding) as f:
         f.write(updated)
 
 
@@ -2772,14 +2772,17 @@ def collect_file_tree(root):
     return [file for file in glob.glob(osp.join(root, '**'), recursive=True) if osp.isfile(file)]
 
 
-def merge_namespaces(to_ns: types.SimpleNamespace, from_ns: types.SimpleNamespace):
+def merge_namespaces(to_ns: types.SimpleNamespace, from_ns: types.SimpleNamespace, trim_from=False):
     """
     - merge from_ns into to_ns
     - to_ns must be a namespace
     - from_ns can be a dict or a namespace
     """
-    for k, v in vars(from_ns).items():
-        setattr(to_ns, k, v)
+    from_ = vars(from_ns)
+    to_ = vars(to_ns)
+    from_keys = [key for key in from_ if key in to_] if trim_from else list(from_.keys())
+    for k in from_keys:
+        setattr(to_ns, k, from_[k])
     return to_ns
 
 

{kkpyutil-1.30.0 → kkpyutil-1.32.0}/pyproject.toml

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