From: Anita Zhang <the.anitazha@gmail.com>
Date: Mon, 1 Feb 2021 03:04:34 +0000 (-0800)
Subject: tools: make update-dbus-docs compatible with Python 3.6
X-Git-Tag: v248-rc1~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=934d0d023e33aa38c56e1e12118be8ddbd839284;p=thirdparty%2Fsystemd.git

tools: make update-dbus-docs compatible with Python 3.6

668b3a42fe9e250912bd3efa4460ed691452d9bf allowed update-dbus-docs.py to start
running on Cent OS 8 (instead of skipping). But subprocess.check_output()'s
text argument didn't exist until Python 3.7 and C8 is still running
Python 3.6. Use universal_newlines instead for backwards compatibility.
---

diff --git a/tools/update-dbus-docs.py b/tools/update-dbus-docs.py
index 269b2196a26..b453a0867e6 100755
--- a/tools/update-dbus-docs.py
+++ b/tools/update-dbus-docs.py
@@ -197,7 +197,7 @@ def subst_output(document, programlisting, stats):
         print(f'COMMAND: {shlex_join(argv)}')
 
     try:
-        out = subprocess.check_output(argv, text=True)
+        out = subprocess.check_output(argv, universal_newlines=True)
     except FileNotFoundError:
         print(f'{executable} not found, ignoring', file=sys.stderr)
         return