From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 22 Feb 2021 21:42:01 +0000 (+0100)
Subject: Revert "generate-dns_type-gperf: modernize python syntax"
X-Git-Tag: v248-rc1~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2ec239c2b74db4cd4bf8b98e40bc9aeff21ea67;p=thirdparty%2Fsystemd.git

Revert "generate-dns_type-gperf: modernize python syntax"

This reverts commit b0a336a66929ed2a146888178157bf1af5c8598c.

Fixes #18708.
---

diff --git a/src/resolve/generate-dns_type-gperf.py b/src/resolve/generate-dns_type-gperf.py
index 7243d3605ac..0d818fb3d97 100755
--- a/src/resolve/generate-dns_type-gperf.py
+++ b/src/resolve/generate-dns_type-gperf.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-"Generate %-from-name.gperf from %-list.txt"
+"""Generate %-from-name.gperf from %-list.txt
+"""
 
 import sys
 
@@ -13,12 +14,12 @@ print("""\
 _Pragma("GCC diagnostic ignored \\"-Wimplicit-fallthrough\\"")
 #endif
 %}""")
-print(f"""\
-struct {name}_name {{ const char* name; int id; }};
+print("""\
+struct {}_name {{ const char* name; int id; }};
 %null-strings
-%%""")
+%%""".format(name))
 
 for line in open(input):
     line = line.rstrip()
     s = line.replace('_', '-')
-    print(f'{s}, {prefix}{line}')
+    print("{}, {}{}".format(s, prefix, line))