convert all f-strings to old-style format strings for python 3.5 compatibility (since that is what's available on the server)

This commit is contained in:
Adrian Kuschelyagi Malacoda 2020-09-01 02:46:37 -05:00
parent ab29250b74
commit b33ea016d5
3 changed files with 15 additions and 15 deletions

View File

@ -24,7 +24,7 @@ DEX_TYPES = [
"MDIGlitchDex", "MetascriptDex", "TMHMDex", "StatDex", "PosterDex", "TypeDex", "UnownDex", "DollDex", "DefaultNameDex",
"BattleTypeDe", "BadgeDescriptionDex", "FacingDex"
]
DEXES = list(chain.from_iterable([[f"{dex_type}{language}" for dex_type in DEX_TYPES] for language in DEX_LANGUAGES]))
DEXES = list(chain.from_iterable([["{}{}".format(dex_type, language) for dex_type in DEX_TYPES] for language in DEX_LANGUAGES]))
FORUM_THREAD_INDEX = "thread_index.json.gz"
@ -42,7 +42,7 @@ class ArchiveLinker(Linker):
directory_name = ""
for name in self.directory_names:
if page_title.startswith(f"{name}/"):
if page_title.startswith("{}/".format(name)):
directory_name = name
page_title = page_title[len(directory_name) + 1:]
break
@ -50,7 +50,7 @@ class ArchiveLinker(Linker):
for key, value in self.replacements.items():
page_title = page_title.replace(key, value)
return f"{directory_name}{'/' if directory_name else ''}{page_title}.html"
return "{}{}{}.html".format(directory_name, '/' if directory_name else '', page_title)
def prepare_thread (thread):
thread.subject = html.unescape(thread.subject)
@ -109,7 +109,7 @@ class ArchiveGenerator():
if page.redirect:
logger.info("Archiving redirect page (%s -> %s) to %s", page.title, page.redirect, page_out)
renderer.render_template_to_file("redirect", page_out, {
"target": f"{base}{linker.translate_page_title(page.redirect)}"
"target": "{}{}".format(base, linker.translate_page_title(page.redirect))
})
else:
logger.info("Archiving page %s to %s", page.title, page_out)
@ -137,12 +137,12 @@ class ArchiveGenerator():
raise e
for category, pages in categories.items():
category_out = f"Category:{linker.translate_page_title(category)}"
category_out = "Category:{}".format(linker.translate_page_title(category))
logger.info("Archiving category %s to %s", category, category_out)
try:
renderer.render_template_to_file("category", category_out, {
"title": f" - {category}",
"title": " - {}".format(category),
"category": category,
"pages": pages
})
@ -202,7 +202,7 @@ class ArchiveGenerator():
})
total_pages = math.ceil((thread.num_replies + 1) / DEFAULT_POSTS_PER_PAGE)
page_links = [{"label": page + 1, "link": f"page-{page}.html"} for page in range(total_pages)]
page_links = [{"label": page + 1, "link": "page-{}.html".format(page)} for page in range(total_pages)]
page = 0
while True:
posts = [prepare_post(post) for post in forum.get_posts_in_thread(thread, page)]

View File

@ -9,8 +9,8 @@ from flask import Flask, redirect, request
app = Flask(__name__)
DEFAULT_ARCHIVES_DOMAIN = "https://archives.glitchcity.info/"
DEFAULT_FORUMS_ARCHIVE = f"{DEFAULT_ARCHIVES_DOMAIN}forums"
DEFAULT_WIKI_ARCHIVE = f"{DEFAULT_ARCHIVES_DOMAIN}wiki"
DEFAULT_FORUMS_ARCHIVE = "{}forums".format(DEFAULT_ARCHIVES_DOMAIN)
DEFAULT_WIKI_ARCHIVE = "{}wiki".format(DEFAULT_ARCHIVES_DOMAIN)
## Wiki redirector
@app.route("/wiki/")
@ -57,10 +57,10 @@ def make_forum_url (request):
url = app.args.forums_archive
if board_id:
url = url + f"board-{board_id}"
url = url + "board-{}".format(board_id)
if thread_id:
url = url + f"/thread-{thread_id}"
url = url + "/thread-{}".format(thread_id)
if not url.endswith("/"):
url = url + "/"
@ -68,7 +68,7 @@ def make_forum_url (request):
return url
def read_thread_index (forums_archive):
with urllib.request.urlopen(f"{forums_archive}{FORUM_THREAD_INDEX}") as gzipped_in:
with urllib.request.urlopen("{}{}".format(forums_archive, FORUM_THREAD_INDEX)) as gzipped_in:
data = gzipped_in.read()
return json.loads(gzip.decompress(data).decode())

View File

@ -32,7 +32,7 @@ INTERWIKI_NAMESPACES = {
FILE_NAMESPACES = ["File:", "Image:"]
CATEGORY_NAMESPACE = "Category:"
CATEGORY_LINK_NAMESPACE = f":{CATEGORY_NAMESPACE}"
CATEGORY_LINK_NAMESPACE = ":{}".format(CATEGORY_NAMESPACE)
class Wiki():
def __init__ (self, xml_path):
@ -152,7 +152,7 @@ def render (wikitext, base="", linker=None):
else:
url = linker.translate_interwiki_title(node.title)
if not url:
url = f"{base}{linker.translate_page_title(node.title)}"
url = "{}{}".format(base, linker.translate_page_title(node.title))
rendered.append('<a href="{}">{}</a>'.format(
url,
@ -205,7 +205,7 @@ def reformat_page_title (page_title):
if not page_title:
return ""
return f"{page_title[0].upper()}{page_title[1:].replace(' ', '_')}"
return "{}{}".format(page_title[0].upper(), page_title[1:].replace(' ', '_'))
class Template():
def __init__ (self, wikicode):