From fed7f5673305d2da5bae62279fd3a06037052f1b Mon Sep 17 00:00:00 2001 From: cbeauchesne Date: Mon, 14 Sep 2020 09:55:03 +0200 Subject: [PATCH] py2, py3.5 --- campbot/core.py | 8 ++++---- tests/fixtures.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/campbot/core.py b/campbot/core.py index 59a908e..bcc0c3c 100644 --- a/campbot/core.py +++ b/campbot/core.py @@ -558,8 +558,8 @@ def report(self, url_or_filename, lang): failing_docs.append(document) if len(failing_docs) != 0: - stdout_report.append(f"{test.name}") - forum_report.append(f"* {test.name}") + stdout_report.append(test.name) + forum_report.append("* {}".format(test.name)) failing_docs.sort(key=lambda d: d.get_title(lang)) @@ -567,8 +567,8 @@ def report(self, url_or_filename, lang): url = document.get_url() title = document.get_title(lang) - stdout_report.append(f" {url}\t {title}") - forum_report.append(f" * [{title}]({url})") + stdout_report.append(" {}\t {}".format(url, title)) + forum_report.append(" * [{}]({})".format(title, url)) print("\n".join(stdout_report)) diff --git a/tests/fixtures.py b/tests/fixtures.py index c5093b1..0b2530d 100644 --- a/tests/fixtures.py +++ b/tests/fixtures.py @@ -9,7 +9,7 @@ def get_message(filename, overwrite_properties=None): data = json.load(io.open(filename, encoding="utf-8")) if overwrite_properties: - data = {**data, **overwrite_properties} + data.update(overwrite_properties) return data