T2117: Cloud-init updated to 22.1

Merged with 22.1 tag from the upstream Cloud-init repository.

Our modules were slightly modified for compatibility with the new
version.

1 files changed, 18 insertions, 7 deletions

diff --git a/cloudinit/atomic_helper.py b/cloudinit/atomic_helper.py
index 485ff92f..ae117fad 100644
--- a/cloudinit/atomic_helper.py
+++ b/cloudinit/atomic_helper.py
@@ -10,8 +10,9 @@ _DEF_PERMS = 0o644
 LOG = logging.getLogger(__name__)
 
 
-def write_file(filename, content, mode=_DEF_PERMS,
-               omode="wb", preserve_mode=False):
+def write_file(
+    filename, content, mode=_DEF_PERMS, omode="wb", preserve_mode=False
+):
     # open filename in mode 'omode', write content, set permissions to 'mode'
 
     if preserve_mode:
@@ -23,12 +24,18 @@ def write_file(filename, content, mode=_DEF_PERMS,
 
     tf = None
     try:
-        tf = tempfile.NamedTemporaryFile(dir=os.path.dirname(filename),
-                                         delete=False, mode=omode)
+        tf = tempfile.NamedTemporaryFile(
+            dir=os.path.dirname(filename), delete=False, mode=omode
+        )
         LOG.debug(
             "Atomically writing to file %s (via temporary file %s) - %s: [%o]"
             " %d bytes/chars",
-            filename, tf.name, omode, mode, len(content))
+            filename,
+            tf.name,
+            omode,
+            mode,
+            len(content),
+        )
         tf.write(content)
         tf.close()
         os.chmod(tf.name, mode)
@@ -42,7 +49,11 @@ def write_file(filename, content, mode=_DEF_PERMS,
 def write_json(filename, data, mode=_DEF_PERMS):
     # dump json representation of data to file filename.
     return write_file(
-        filename, json.dumps(data, indent=1, sort_keys=True) + "\n",
-        omode="w", mode=mode)
+        filename,
+        json.dumps(data, indent=1, sort_keys=True) + "\n",
+        omode="w",
+        mode=mode,
+    )
+
 
 # vi: ts=4 expandtab