Replace .format with python 3.6 f-strings in onionshare_gui module

This commit is contained in:
Micah Lee 2019-10-20 10:30:16 -07:00
parent b9a7361d9c
commit 3a2cc8bdee
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
9 changed files with 42 additions and 75 deletions

View file

@ -655,22 +655,15 @@ class OnionShareGui(QtWidgets.QMainWindow):
)
if event["type"] == Web.REQUEST_OTHER:
if event["path"] != "/favicon.ico" and event[
"path"
] != "/{}/shutdown".format(mode.web.shutdown_password):
self.status_bar.showMessage(
"{0:s}: {1:s}".format(
strings._("other_page_loaded"), event["path"]
)
)
if (
event["path"] != "/favicon.ico"
and event["path"] != f"/{mode.web.shutdown_password}/shutdown"
):
self.status_bar.showMessage(f"{strings._("other_page_loaded")}: {event["path"]}")
if event["type"] == Web.REQUEST_INVALID_PASSWORD:
self.status_bar.showMessage(
"[#{0:d}] {1:s}: {2:s}".format(
mode.web.invalid_passwords_count,
strings._("incorrect_password"),
event["data"],
)
f"[#{mode.web.invalid_passwords_count}] {strings._('incorrect_password')}: {event['data']}"
)
mode.timer_callback()