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:
parent
ab29250b74
commit
b33ea016d5
@ -24,7 +24,7 @@ DEX_TYPES = [
|
|||||||
"MDIGlitchDex", "MetascriptDex", "TMHMDex", "StatDex", "PosterDex", "TypeDex", "UnownDex", "DollDex", "DefaultNameDex",
|
"MDIGlitchDex", "MetascriptDex", "TMHMDex", "StatDex", "PosterDex", "TypeDex", "UnownDex", "DollDex", "DefaultNameDex",
|
||||||
"BattleTypeDe", "BadgeDescriptionDex", "FacingDex"
|
"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"
|
FORUM_THREAD_INDEX = "thread_index.json.gz"
|
||||||
|
|
||||||
@ -42,7 +42,7 @@ class ArchiveLinker(Linker):
|
|||||||
|
|
||||||
directory_name = ""
|
directory_name = ""
|
||||||
for name in self.directory_names:
|
for name in self.directory_names:
|
||||||
if page_title.startswith(f"{name}/"):
|
if page_title.startswith("{}/".format(name)):
|
||||||
directory_name = name
|
directory_name = name
|
||||||
page_title = page_title[len(directory_name) + 1:]
|
page_title = page_title[len(directory_name) + 1:]
|
||||||
break
|
break
|
||||||
@ -50,7 +50,7 @@ class ArchiveLinker(Linker):
|
|||||||
for key, value in self.replacements.items():
|
for key, value in self.replacements.items():
|
||||||
page_title = page_title.replace(key, value)
|
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):
|
def prepare_thread (thread):
|
||||||
thread.subject = html.unescape(thread.subject)
|
thread.subject = html.unescape(thread.subject)
|
||||||
@ -109,7 +109,7 @@ class ArchiveGenerator():
|
|||||||
if page.redirect:
|
if page.redirect:
|
||||||
logger.info("Archiving redirect page (%s -> %s) to %s", page.title, page.redirect, page_out)
|
logger.info("Archiving redirect page (%s -> %s) to %s", page.title, page.redirect, page_out)
|
||||||
renderer.render_template_to_file("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:
|
else:
|
||||||
logger.info("Archiving page %s to %s", page.title, page_out)
|
logger.info("Archiving page %s to %s", page.title, page_out)
|
||||||
@ -137,12 +137,12 @@ class ArchiveGenerator():
|
|||||||
raise e
|
raise e
|
||||||
|
|
||||||
for category, pages in categories.items():
|
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)
|
logger.info("Archiving category %s to %s", category, category_out)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
renderer.render_template_to_file("category", category_out, {
|
renderer.render_template_to_file("category", category_out, {
|
||||||
"title": f" - {category}",
|
"title": " - {}".format(category),
|
||||||
"category": category,
|
"category": category,
|
||||||
"pages": pages
|
"pages": pages
|
||||||
})
|
})
|
||||||
@ -202,7 +202,7 @@ class ArchiveGenerator():
|
|||||||
})
|
})
|
||||||
|
|
||||||
total_pages = math.ceil((thread.num_replies + 1) / DEFAULT_POSTS_PER_PAGE)
|
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
|
page = 0
|
||||||
while True:
|
while True:
|
||||||
posts = [prepare_post(post) for post in forum.get_posts_in_thread(thread, page)]
|
posts = [prepare_post(post) for post in forum.get_posts_in_thread(thread, page)]
|
||||||
|
@ -9,8 +9,8 @@ from flask import Flask, redirect, request
|
|||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
DEFAULT_ARCHIVES_DOMAIN = "https://archives.glitchcity.info/"
|
DEFAULT_ARCHIVES_DOMAIN = "https://archives.glitchcity.info/"
|
||||||
DEFAULT_FORUMS_ARCHIVE = f"{DEFAULT_ARCHIVES_DOMAIN}forums"
|
DEFAULT_FORUMS_ARCHIVE = "{}forums".format(DEFAULT_ARCHIVES_DOMAIN)
|
||||||
DEFAULT_WIKI_ARCHIVE = f"{DEFAULT_ARCHIVES_DOMAIN}wiki"
|
DEFAULT_WIKI_ARCHIVE = "{}wiki".format(DEFAULT_ARCHIVES_DOMAIN)
|
||||||
|
|
||||||
## Wiki redirector
|
## Wiki redirector
|
||||||
@app.route("/wiki/")
|
@app.route("/wiki/")
|
||||||
@ -57,10 +57,10 @@ def make_forum_url (request):
|
|||||||
url = app.args.forums_archive
|
url = app.args.forums_archive
|
||||||
|
|
||||||
if board_id:
|
if board_id:
|
||||||
url = url + f"board-{board_id}"
|
url = url + "board-{}".format(board_id)
|
||||||
|
|
||||||
if thread_id:
|
if thread_id:
|
||||||
url = url + f"/thread-{thread_id}"
|
url = url + "/thread-{}".format(thread_id)
|
||||||
|
|
||||||
if not url.endswith("/"):
|
if not url.endswith("/"):
|
||||||
url = url + "/"
|
url = url + "/"
|
||||||
@ -68,7 +68,7 @@ def make_forum_url (request):
|
|||||||
return url
|
return url
|
||||||
|
|
||||||
def read_thread_index (forums_archive):
|
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()
|
data = gzipped_in.read()
|
||||||
return json.loads(gzip.decompress(data).decode())
|
return json.loads(gzip.decompress(data).decode())
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ INTERWIKI_NAMESPACES = {
|
|||||||
|
|
||||||
FILE_NAMESPACES = ["File:", "Image:"]
|
FILE_NAMESPACES = ["File:", "Image:"]
|
||||||
CATEGORY_NAMESPACE = "Category:"
|
CATEGORY_NAMESPACE = "Category:"
|
||||||
CATEGORY_LINK_NAMESPACE = f":{CATEGORY_NAMESPACE}"
|
CATEGORY_LINK_NAMESPACE = ":{}".format(CATEGORY_NAMESPACE)
|
||||||
|
|
||||||
class Wiki():
|
class Wiki():
|
||||||
def __init__ (self, xml_path):
|
def __init__ (self, xml_path):
|
||||||
@ -152,7 +152,7 @@ def render (wikitext, base="", linker=None):
|
|||||||
else:
|
else:
|
||||||
url = linker.translate_interwiki_title(node.title)
|
url = linker.translate_interwiki_title(node.title)
|
||||||
if not url:
|
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(
|
rendered.append('<a href="{}">{}</a>'.format(
|
||||||
url,
|
url,
|
||||||
@ -205,7 +205,7 @@ def reformat_page_title (page_title):
|
|||||||
if not page_title:
|
if not page_title:
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
return f"{page_title[0].upper()}{page_title[1:].replace(' ', '_')}"
|
return "{}{}".format(page_title[0].upper(), page_title[1:].replace(' ', '_'))
|
||||||
|
|
||||||
class Template():
|
class Template():
|
||||||
def __init__ (self, wikicode):
|
def __init__ (self, wikicode):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user