From 1f9441a72b1170103b903462f7385b94a6d5a06d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 22 Feb 2021 22:41:52 +0100 Subject: [PATCH 1/2] Stop using f-strings in generate-sym-test.py This partially reverts 7857b6e8383f5debab9544ef3abb15a27830fafa. Debian 9 has python3.5 which does not have f-strings yet. Partially fixes #18708. --- src/test/generate-sym-test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/generate-sym-test.py b/src/test/generate-sym-test.py index 42a9a47e3e..955d5e9699 100755 --- a/src/test/generate-sym-test.py +++ b/src/test/generate-sym-test.py @@ -18,9 +18,9 @@ for line in open(sys.argv[1]): if match: s = match.group(1) if s == 'sd_bus_object_vtable_format': - print(f' &{s},') + print(' &{},'.format(s)) else: - print(f' {s},') + print(' {},'.format(s)) print('''}; From f2ec239c2b74db4cd4bf8b98e40bc9aeff21ea67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 22 Feb 2021 22:42:01 +0100 Subject: [PATCH 2/2] Revert "generate-dns_type-gperf: modernize python syntax" This reverts commit b0a336a66929ed2a146888178157bf1af5c8598c. Fixes #18708. --- src/resolve/generate-dns_type-gperf.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/resolve/generate-dns_type-gperf.py b/src/resolve/generate-dns_type-gperf.py index 7243d3605a..0d818fb3d9 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))