From 7e57a8f71ea2ecded590633aa03c34ebc359d953 Mon Sep 17 00:00:00 2001 From: redfish Date: Tue, 16 Apr 2019 20:45:21 -0400 Subject: [PATCH] Ui,Translate: remove bytearray format string Py 3.4 does not support bytearray format strings for % operator: b"%s" % s --- plugins/TranslateSite/TranslateSitePlugin.py | 2 +- src/Ui/UiRequest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/TranslateSite/TranslateSitePlugin.py b/plugins/TranslateSite/TranslateSitePlugin.py index 759cde6b..ccb524ae 100644 --- a/plugins/TranslateSite/TranslateSitePlugin.py +++ b/plugins/TranslateSite/TranslateSitePlugin.py @@ -57,7 +57,7 @@ class UiRequestPlugin(object): if not lang_file_exist or inner_path not in content_json.get("translate", []): for part in file_generator: if inner_path.endswith(".html"): - yield part.replace(b"lang={lang}", b"lang=%s" % translate.lang.encode("utf8")) # lang get parameter to .js file to avoid cache + yield part.replace(b"lang={lang}", b"lang=" + translate.lang.encode("utf8")) # lang get parameter to .js file to avoid cache else: yield part else: diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py index dd3653e0..e40d9814 100644 --- a/src/Ui/UiRequest.py +++ b/src/Ui/UiRequest.py @@ -299,7 +299,7 @@ class UiRequest(object): # Redirect to an url def actionRedirect(self, url): self.start_response('301 Redirect', [('Location', str(url))]) - yield b"Location changed: %s" % url.encode("utf8") + yield b"Location changed: " + url.encode("utf8") def actionIndex(self): return self.actionRedirect("/" + config.homepage)