From 93d2687d2458e69b98c968aa193ae18ae064fff0 Mon Sep 17 00:00:00 2001 From: Robert Coup Date: Fri, 31 May 2019 12:12:39 +0100 Subject: [PATCH] f-strings only date back to Py3.6 --- gunicorn/config.py | 4 ++-- tests/test_config.py | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gunicorn/config.py b/gunicorn/config.py index 02e06d0c..553962fc 100644 --- a/gunicorn/config.py +++ b/gunicorn/config.py @@ -57,8 +57,8 @@ class Config(object): for k in sorted(self.settings): v = self.settings[k].value if callable(v): - v = "<%s()>" % v.__qualname__ - lines.append(f"{k:{kmax}} = {v}") + v = "<{}()>".format(v.__qualname__) + lines.append("{k:{kmax}} = {v}".format(k=k, v=v, kmax=kmax)) return "\n".join(lines) def __getattr__(self, name): diff --git a/tests/test_config.py b/tests/test_config.py index 67480af3..71a11ea1 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -454,7 +454,7 @@ def test_str(): } for i, line in enumerate(o.splitlines()): m = re.match(r'^(\w+)\s+= ', line) - assert m, f"Config line {i} didn't match expected format: {line!r}" + assert m, "Line {} didn't match expected format: {!r}".format(i, line) key = m.group(1) try: @@ -462,10 +462,12 @@ def test_str(): except KeyError: continue - line_re = fr'^{key}\s+= {re.escape(s)}$' - assert re.match(line_re, line), f'{line_re!r} != {line!r}' + line_re = r'^{}\s+= {}$'.format(key, re.escape(s)) + assert re.match(line_re, line), '{!r} != {!r}'.format(line_re, line) if not OUTPUT_MATCH: break else: - assert False, f'missing expected setting lines? {list(OUTPUT_MATCH.keys())}' + assert False, 'missing expected setting lines? {}'.format( + OUTPUT_MATCH.keys() + )