Update upstream source from tag 'upstream/1.31.2'

Update to upstream version '1.31.2'
with Debian dir 4ebe0ca706fc53eceb778881b680572ca5a0231c

1 files changed, 6 insertions, 6 deletions

diff --git a/gallery_dl/extractor/vk.py b/gallery_dl/extractor/vk.py
index e7453fc..ea42265 100644
--- a/gallery_dl/extractor/vk.py
+++ b/gallery_dl/extractor/vk.py
@@ -101,7 +101,7 @@ class VkExtractor(Extractor):
                 url, method="POST", headers=headers, data=data)
             if response.history and "/challenge.html" in response.url:
                 raise exception.AbortExtraction(
-                    f"HTTP redirect to 'challenge' page:\n{response.url}")
+                    "HTTP redirect to 'challenge' page:\n" + response.url)
 
             payload = response.json()["payload"][1]
             if len(payload) < 4:
@@ -134,7 +134,7 @@ class VkExtractor(Extractor):
 class VkPhotosExtractor(VkExtractor):
     """Extractor for photos from a vk user"""
     subcategory = "photos"
-    pattern = (rf"{BASE_PATTERN}/(?:"
+    pattern = (BASE_PATTERN + r"/(?:"
                r"(?:albums|photos|id)(-?\d+)"
                r"|(?!(?:album|tag|wall)-?\d+_?)([^/?#]+))")
     example = "https://vk.com/id12345"
@@ -184,7 +184,7 @@ class VkAlbumExtractor(VkExtractor):
     """Extractor for a vk album"""
     subcategory = "album"
     directory_fmt = ("{category}", "{user[id]}", "{album[id]}")
-    pattern = rf"{BASE_PATTERN}/album(-?\d+)_(\d+)$"
+    pattern = BASE_PATTERN + r"/album(-?\d+)_(\d+)$"
     example = "https://vk.com/album12345_00"
 
     def photos(self):
@@ -228,7 +228,7 @@ class VkTaggedExtractor(VkExtractor):
     """Extractor for a vk tagged photos"""
     subcategory = "tagged"
     directory_fmt = ("{category}", "{user[id]}", "tags")
-    pattern = rf"{BASE_PATTERN}/tag(-?\d+)$"
+    pattern = BASE_PATTERN + r"/tag(-?\d+)$"
     example = "https://vk.com/tag12345"
 
     def __init__(self, match):
@@ -236,7 +236,7 @@ class VkTaggedExtractor(VkExtractor):
         self.user_id = match[1]
 
     def photos(self):
-        return self._pagination(f"tag{self.user_id}")
+        return self._pagination("tag" + self.user_id)
 
     def metadata(self):
         return {"user": {"id": self.user_id}}
@@ -247,7 +247,7 @@ class VkWallPostExtractor(VkExtractor):
     subcategory = "wall-post"
     directory_fmt = ("{category}", "{user[id]}", "wall")
     filename_fmt = "{wall[id]}_{num}.{extension}"
-    pattern = rf"{BASE_PATTERN}/wall(-?\d+)_(\d+)"
+    pattern = BASE_PATTERN + r"/wall(-?\d+)_(\d+)"
     example = "https://vk.com/wall12345_123"
 
     def photos(self):