From: Michał Kępień <michal@isc.org>
Date: Thu, 21 May 2020 09:33:11 +0000 (+0200)
Subject: Do not use f-strings in Python system tests
X-Git-Tag: v9.17.2~63^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5562c38ffb33da7f074dbe796a21124fe1ecf9dd;p=thirdparty%2Fbind9.git

Do not use f-strings in Python system tests

Use str.format() instead of f-strings in Python system tests to enable
them to work on Python 3 versions older than 3.6 as the latter is not
available on some operating systems used in GitLab CI that are still
actively supported (CentOS 6, Debian 9, Ubuntu 16.04).
---

diff --git a/bin/tests/system/statschannel/helper.py b/bin/tests/system/statschannel/helper.py
index 7b53e9e9fec..ba6cf701341 100644
--- a/bin/tests/system/statschannel/helper.py
+++ b/bin/tests/system/statschannel/helper.py
@@ -79,9 +79,9 @@ def zone_mtime(zonedir, name):
 
 
 def zone_keyid(nameserver, zone, key):
-    with open(f'{nameserver}/{zone}.{key}.id') as f:
+    with open('{}/{}.{}.id'.format(nameserver, zone, key)) as f:
         keyid = f.read().strip()
-        print(f'{zone}-{key} ID: {keyid}')
+        print('{}-{} ID: {}'.format(zone, key, keyid))
     return keyid