New upstream version 1.31.2.upstream/1.31.2upstream

1 files changed, 6 insertions, 5 deletions

diff --git a/gallery_dl/extractor/sankaku.py b/gallery_dl/extractor/sankaku.py
index 690b515..6cb9f79 100644
--- a/gallery_dl/extractor/sankaku.py
+++ b/gallery_dl/extractor/sankaku.py
@@ -119,7 +119,7 @@ class SankakuTagExtractor(SankakuExtractor):
     subcategory = "tag"
     directory_fmt = ("{category}", "{search_tags}")
     archive_fmt = "t_{search_tags}_{id}"
-    pattern = rf"{BASE_PATTERN}(?:/posts)?/?\?([^#]*)"
+    pattern = BASE_PATTERN + r"(?:/posts)?/?\?([^#]*)"
     example = "https://sankaku.app/?tags=TAG"
 
     def __init__(self, match):
@@ -149,7 +149,7 @@ class SankakuPoolExtractor(SankakuExtractor):
     subcategory = "pool"
     directory_fmt = ("{category}", "pool", "{pool[id]} {pool[name_en]}")
     archive_fmt = "p_{pool}_{id}"
-    pattern = rf"{BASE_PATTERN}/(?:books|pools?/show)/(\w+)"
+    pattern = BASE_PATTERN + r"/(?:books|pools?/show)/(\w+)"
     example = "https://sankaku.app/books/12345"
 
     def metadata(self):
@@ -171,7 +171,7 @@ class SankakuPostExtractor(SankakuExtractor):
     """Extractor for single posts from sankaku.app"""
     subcategory = "post"
     archive_fmt = "{id}"
-    pattern = rf"{BASE_PATTERN}/posts?(?:/show)?/(\w+)"
+    pattern = BASE_PATTERN + r"/posts?(?:/show)?/(\w+)"
     example = "https://sankaku.app/post/show/12345"
 
     def posts(self):
@@ -181,7 +181,7 @@ class SankakuPostExtractor(SankakuExtractor):
 class SankakuBooksExtractor(SankakuExtractor):
     """Extractor for books by tag search on sankaku.app"""
     subcategory = "books"
-    pattern = rf"{BASE_PATTERN}/books/?\?([^#]*)"
+    pattern = BASE_PATTERN + r"/books/?\?([^#]*)"
     example = "https://sankaku.app/books?tags=TAG"
 
     def __init__(self, match):
@@ -193,7 +193,7 @@ class SankakuBooksExtractor(SankakuExtractor):
         params = {"tags": self.tags, "pool_type": "0"}
         for pool in self.api.pools_keyset(params):
             pool["_extractor"] = SankakuPoolExtractor
-            url = f"https://sankaku.app/books/{pool['id']}"
+            url = "https://sankaku.app/books/" + pool["id"]
             yield Message.Queue, url, pool
 
 
@@ -356,6 +356,7 @@ def _authenticate_impl(extr, username, password):
     extr.log.info("Logging in as %s", username)
 
     api = extr.api
+    api.headers["Authorization"] = None
     url = api.ROOT + "/auth/token"
     data = {"login": username, "password": password}