New upstream version 1.31.1.upstream/1.31.1

1 files changed, 9 insertions, 9 deletions

diff --git a/gallery_dl/extractor/gelbooru.py b/gallery_dl/extractor/gelbooru.py
index f32059e..0571fcd 100644
--- a/gallery_dl/extractor/gelbooru.py
+++ b/gallery_dl/extractor/gelbooru.py
@@ -148,7 +148,7 @@ class GelbooruBase():
 class GelbooruTagExtractor(GelbooruBase,
                            gelbooru_v02.GelbooruV02TagExtractor):
     """Extractor for images from gelbooru.com based on search-tags"""
-    pattern = BASE_PATTERN + r"page=post&s=list&tags=([^&#]*)"
+    pattern = rf"{BASE_PATTERN}page=post&s=list&tags=([^&#]*)"
     example = "https://gelbooru.com/index.php?page=post&s=list&tags=TAG"
 
 
@@ -156,7 +156,7 @@ class GelbooruPoolExtractor(GelbooruBase,
                             gelbooru_v02.GelbooruV02PoolExtractor):
     """Extractor for gelbooru pools"""
     per_page = 45
-    pattern = BASE_PATTERN + r"page=pool&s=show&id=(\d+)"
+    pattern = rf"{BASE_PATTERN}page=pool&s=show&id=(\d+)"
     example = "https://gelbooru.com/index.php?page=pool&s=show&id=12345"
 
     skip = GelbooruBase._skip_offset
@@ -187,7 +187,7 @@ class GelbooruFavoriteExtractor(GelbooruBase,
                                 gelbooru_v02.GelbooruV02FavoriteExtractor):
     """Extractor for gelbooru favorites"""
     per_page = 100
-    pattern = BASE_PATTERN + r"page=favorites&s=view&id=(\d+)"
+    pattern = rf"{BASE_PATTERN}page=favorites&s=view&id=(\d+)"
     example = "https://gelbooru.com/index.php?page=favorites&s=view&id=12345"
 
     skip = GelbooruBase._skip_offset
@@ -246,7 +246,7 @@ class GelbooruFavoriteExtractor(GelbooruBase,
 
             for fav in favs:
                 for post in self._api_request({"id": fav["favorite"]}):
-                    post["date_favorited"] = text.parse_timestamp(fav["added"])
+                    post["date_favorited"] = self.parse_timestamp(fav["added"])
                     yield post
 
             params["pid"] += 1
@@ -273,7 +273,7 @@ class GelbooruFavoriteExtractor(GelbooruBase,
 
             for fav in favs:
                 for post in self._api_request({"id": fav["favorite"]}):
-                    post["date_favorited"] = text.parse_timestamp(fav["added"])
+                    post["date_favorited"] = self.parse_timestamp(fav["added"])
                     yield post
 
             params["pid"] -= 1
@@ -284,10 +284,10 @@ class GelbooruFavoriteExtractor(GelbooruBase,
 class GelbooruPostExtractor(GelbooruBase,
                             gelbooru_v02.GelbooruV02PostExtractor):
     """Extractor for single images from gelbooru.com"""
-    pattern = (BASE_PATTERN +
-               r"(?=(?:[^#]+&)?page=post(?:&|#|$))"
-               r"(?=(?:[^#]+&)?s=view(?:&|#|$))"
-               r"(?:[^#]+&)?id=(\d+)")
+    pattern = (rf"{BASE_PATTERN}"
+               rf"(?=(?:[^#]+&)?page=post(?:&|#|$))"
+               rf"(?=(?:[^#]+&)?s=view(?:&|#|$))"
+               rf"(?:[^#]+&)?id=(\d+)")
     example = "https://gelbooru.com/index.php?page=post&s=view&id=12345"