yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updating string format synatx part 2

Browse Source
This commit is contained in:
Mouse Reeve
2021-09-18 11:32:00 -07:00
parent be86fbcf4d
commit acfb1bb376
36 changed files with 96 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bookwyrm/views/author.py
View File

@ -55,4 +55,4 @@ class EditAuthor(View):
return TemplateResponse(request, "author/edit_author.html", data)
author = form.save()
return redirect("/author/%s" % author.id)
return redirect(f"/author/{author.id}")

2
bookwyrm/views/edit_user.py
View File

@ -79,7 +79,7 @@ def save_user_form(form):
# set the name to a hash
extension = form.files["avatar"].name.split(".")[-1]
filename = "%s.%s" % (uuid4(), extension)
filename = f"{uuid4()}.{extension}"
user.avatar.save(filename, image, save=False)
user.save()
return user

2
bookwyrm/views/editions.py
View File

@ -96,4 +96,4 @@ def switch_edition(request):
readthrough.book = new_edition
readthrough.save()
return redirect("/book/%d" % new_edition.id)
return redirect(f"/book/{new_edition.id}")

2
bookwyrm/views/feed.py
View File

@ -42,7 +42,7 @@ class Feed(View):
"tab": tab,
"streams": STREAMS,
"goal_form": forms.GoalForm(),
"path": "/%s" % tab["key"],
"path": f"/{tab['key']}",
},
}
return TemplateResponse(request, "feed/feed.html", data)

2
bookwyrm/views/follow.py
View File

@ -86,4 +86,4 @@ def delete_follow_request(request):
return HttpResponseBadRequest()
follow_request.delete()
return redirect("/user/%s" % request.user.localname)
return redirect(f"/user/{request.user.localname}")

2
bookwyrm/views/helpers.py
View File

@ -113,7 +113,7 @@ def handle_remote_webfinger(query):
try:
user = models.User.objects.get(username__iexact=query)
except models.User.DoesNotExist:
url = "https://%s/.well-known/webfinger?resource=acct:%s" % (domain, query)
url = f"https://{domain}/.well-known/webfinger?resource=acct:{query}"
try:
data = get_data(url)
except (ConnectorException, HTTPError):

4
bookwyrm/views/import_data.py
View File

@ -68,7 +68,7 @@ class Import(View):
importer.start_import(job)
return redirect("/import/%d" % job.id)
return redirect(f"/import/{job.id}")
return HttpResponseBadRequest()
@ -112,4 +112,4 @@ class ImportStatus(View):
items,
)
importer.start_import(job)
return redirect("/import/%d" % job.id)
return redirect(f"/import/{job.id}")

2
bookwyrm/views/inbox.py
View File

@ -71,7 +71,7 @@ def is_blocked_user_agent(request):
user_agent = request.headers.get("User-Agent")
if not user_agent:
return False
url = re.search(r"https?://{:s}/?".format(regex.DOMAIN), user_agent)
url = re.search(rf"https?://{regex.DOMAIN}/?", user_agent)
if not url:
return False
url = url.group()

4
bookwyrm/views/list.py
View File

@ -322,7 +322,7 @@ def add_book(request):
path = reverse("list", args=[book_list.id])
params = request.GET.copy()
params["updated"] = True
return redirect("{:s}?{:s}".format(path, urlencode(params)))
return redirect(f"{path}?{urlencode(params)}")
@require_POST
@ -396,7 +396,7 @@ def set_book_position(request, list_item_id):
def increment_order_in_reverse(
book_list_id: int, start: int, end: Optional[int] = None
):
"""increase the order nu,ber for every item in a list"""
"""increase the order number for every item in a list"""
try:
book_list = models.List.objects.get(id=book_list_id)
except models.List.DoesNotExist:

2
bookwyrm/views/login.py
View File

@ -46,7 +46,7 @@ class Login(View):
except models.User.DoesNotExist: # maybe it's a full username?
username = localname
else:
username = "%s@%s" % (localname, DOMAIN)
username = f"{localname}@{DOMAIN}"
password = login_form.data["password"]
# perform authentication

2
bookwyrm/views/password.py
View File

@ -38,7 +38,7 @@ class PasswordResetRequest(View):
# create a new reset code
code = models.PasswordReset.objects.create(user=user)
password_reset_email(code)
data = {"message": _("A password reset link sent to %s" % email)}
data = {"message": _(f"A password reset link sent to {email}")}
return TemplateResponse(request, "password_reset_request.html", data)

2
bookwyrm/views/register.py
View File

@ -64,7 +64,7 @@ class Register(View):
return TemplateResponse(request, "invite.html", data)
return TemplateResponse(request, "login.html", data)
username = "%s@%s" % (localname, DOMAIN)
username = f"{localname}@{DOMAIN}"
user = models.User.objects.create_user(
username,
email,

2
bookwyrm/views/search.py
View File

@ -63,7 +63,7 @@ class Search(View):
data["results"] = paginated
data["remote"] = search_remote
return TemplateResponse(request, "search/{:s}.html".format(search_type), data)
return TemplateResponse(request, f"search/{search_type}.html", data)
def book_search(query, _, min_confidence, search_remote=False):

8
bookwyrm/views/status.py
View File

@ -36,7 +36,7 @@ class CreateStatus(View):
status_type = status_type[0].upper() + status_type[1:]
try:
form = getattr(forms, "%sForm" % status_type)(request.POST)
form = getattr(forms, f"{status_type}Form")(request.POST)
except AttributeError:
return HttpResponseBadRequest()
if not form.is_valid():
@ -58,8 +58,8 @@ class CreateStatus(View):
# turn the mention into a link
content = re.sub(
r"%s([^@]|$)" % mention_text,
r'<a href="%s">%s</a>\g<1>' % (mention_user.remote_id, mention_text),
rf"{mention_text}([^@]|$)",
rf'<a href="{mention_user.remote_id}">{mention_text}</a>\g<1>',
content,
)
# add reply parent to mentions
@ -182,7 +182,7 @@ def format_links(content):
if url.fragment != "":
link += "#" + url.fragment
formatted_content += '<a href="%s">%s</a>' % (potential_link, link)
formatted_content += f'<a href="{potential_link}">{link}</a>'
except (ValidationError, UnicodeError):
formatted_content += potential_link

4
bookwyrm/views/wellknown.py
View File

@ -26,7 +26,7 @@ def webfinger(request):
return JsonResponse(
{
"subject": "acct:%s" % (user.username),
"subject": f"acct:{user.username}",
"links": [
{
"rel": "self",
@ -46,7 +46,7 @@ def nodeinfo_pointer(_):
"links": [
{
"rel": "http://nodeinfo.diaspora.software/ns/schema/2.0",
"href": "https://%s/nodeinfo/2.0" % DOMAIN,
"href": f"https://{DOMAIN}/nodeinfo/2.0",
}
]
}