replace old %-formatted and .format(…) strings with f-strings (#7671)

mostly using flynt
https://github.com/ikamensh/flynt
This commit is contained in:
Mike Fährmann
2025-06-28 19:36:16 +02:00
parent f77e98b57d
commit 9dbe33b6de
167 changed files with 756 additions and 891 deletions

View File

@@ -23,16 +23,12 @@ class KabeuchiUserExtractor(Extractor):
pattern = r"(?:https?://)?kabe-uchiroom\.com/mypage/?\?id=(\d+)"
example = "https://kabe-uchiroom.com/mypage/?id=12345"
def __init__(self, match):
Extractor.__init__(self, match)
self.user_id = match[1]
def items(self):
base = "{}/accounts/upfile/{}/{}/".format(
self.root, self.user_id[-1], self.user_id)
uid = self.groups[0]
base = f"{self.root}/accounts/upfile/{uid[-1]}/{uid}/"
keys = ("image1", "image2", "image3", "image4", "image5", "image6")
for post in self.posts():
for post in self.posts(uid):
if post.get("is_ad") or not post["image1"]:
continue
@@ -48,8 +44,8 @@ class KabeuchiUserExtractor(Extractor):
post["num"] = ord(key[-1]) - 48
yield Message.Url, url, text.nameext_from_url(name, post)
def posts(self):
url = "{}/mypage/?id={}".format(self.root, self.user_id)
def posts(self, uid):
url = f"{self.root}/mypage/?id={uid}"
response = self.request(url)
if response.history and response.url == self.root + "/":
raise exception.NotFoundError("user")
@@ -57,7 +53,7 @@ class KabeuchiUserExtractor(Extractor):
return self._pagination(target_id)
def _pagination(self, target_id):
url = "{}/get_posts.php".format(self.root)
url = f"{self.root}/get_posts.php"
data = {
"user_id" : "0",
"target_id" : target_id,