f-strings only date back to Py3.6

This commit is contained in:
Robert Coup 2019-05-31 12:12:39 +01:00
parent 13c5d72bd1
commit 93d2687d24
2 changed files with 8 additions and 6 deletions

View File

@ -57,8 +57,8 @@ class Config(object):
for k in sorted(self.settings): for k in sorted(self.settings):
v = self.settings[k].value v = self.settings[k].value
if callable(v): if callable(v):
v = "<%s()>" % v.__qualname__ v = "<{}()>".format(v.__qualname__)
lines.append(f"{k:{kmax}} = {v}") lines.append("{k:{kmax}} = {v}".format(k=k, v=v, kmax=kmax))
return "\n".join(lines) return "\n".join(lines)
def __getattr__(self, name): def __getattr__(self, name):

View File

@ -454,7 +454,7 @@ def test_str():
} }
for i, line in enumerate(o.splitlines()): for i, line in enumerate(o.splitlines()):
m = re.match(r'^(\w+)\s+= ', line) 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) key = m.group(1)
try: try:
@ -462,10 +462,12 @@ def test_str():
except KeyError: except KeyError:
continue continue
line_re = fr'^{key}\s+= {re.escape(s)}$' line_re = r'^{}\s+= {}$'.format(key, re.escape(s))
assert re.match(line_re, line), f'{line_re!r} != {line!r}' assert re.match(line_re, line), '{!r} != {!r}'.format(line_re, line)
if not OUTPUT_MATCH: if not OUTPUT_MATCH:
break break
else: else:
assert False, f'missing expected setting lines? {list(OUTPUT_MATCH.keys())}' assert False, 'missing expected setting lines? {}'.format(
OUTPUT_MATCH.keys()
)