From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 22 Mar 2022 09:10:39 +0000 (+0100)
Subject: tools/dbus_exporter: deblackify and shorten code a bit
X-Git-Tag: v251-rc1~72^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b9d38f5c8711f138456e65aec3b69c55ed1ea19;p=thirdparty%2Fsystemd.git

tools/dbus_exporter: deblackify and shorten code a bit

When we do mkdir, we should just use 0o777 and let the umask take care of the
rest. Specifying an explicit mode is inappropriate. And when touching the code,
let's replace black madness with normal python style.
---

diff --git a/tools/dbus_exporter.py b/tools/dbus_exporter.py
index 4da8b82af48..f94f261e079 100755
--- a/tools/dbus_exporter.py
+++ b/tools/dbus_exporter.py
@@ -4,58 +4,39 @@ from argparse import ArgumentParser
 from pathlib import Path
 from subprocess import run, PIPE
 
-
 def extract_interfaces_xml(output_dir, executable):
-    list_interfaces_process = run(
+    proc = run(
         args=[executable.absolute(), '--bus-introspect', 'list'],
         stdout=PIPE,
         check=True,
-        universal_newlines=True,
-    )
-
-    interfaces_lines = list_interfaces_process.stdout.splitlines()
+        universal_newlines=True)
 
-    interface_names = [x.split()[1] for x in interfaces_lines]
+    interface_names = (x.split()[1] for x in proc.stdout.splitlines())
 
     for interface_name in interface_names:
-        interface_introspection_run = run(
+        proc = run(
             args=[executable.absolute(), '--bus-introspect', interface_name],
             stdout=PIPE,
             check=True,
-            universal_newlines=True,
-        )
+            universal_newlines=True)
 
         interface_file_name = output_dir / (interface_name + '.xml')
-        with open(interface_file_name, mode='w') as f:
-            f.write(interface_introspection_run.stdout)
+        interface_file_name.write_text(proc.stdout)
         interface_file_name.chmod(0o644)
 
-
-def iterate_executables(output_dir, executables):
-    output_dir.mkdir(mode=0o755, exist_ok=True)
-
-    for exe in executables:
-        extract_interfaces_xml(output_dir, exe)
-
-
 def main():
     parser = ArgumentParser()
-
-    parser.add_argument(
-        'output',
-        type=Path,
-    )
-
-    parser.add_argument(
-        'executables',
-        type=Path,
-        nargs='+',
-    )
+    parser.add_argument('output',
+                        type=Path)
+    parser.add_argument('executables',
+                        nargs='+',
+                        type=Path)
 
     args = parser.parse_args()
 
-    iterate_executables(args.output, args.executables)
-
+    args.output.mkdir(exist_ok=True)
+    for exe in args.executables:
+        extract_interfaces_xml(args.output, exe)
 
 if __name__ == '__main__':
     main()