New upstream version 1.26.0.upstream/1.26.0

1 files changed, 9 insertions, 30 deletions

diff --git a/gallery_dl/extractor/3dbooru.py b/gallery_dl/extractor/3dbooru.py
index e0066cb..c1bc9e5 100644
--- a/gallery_dl/extractor/3dbooru.py
+++ b/gallery_dl/extractor/3dbooru.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2015-2020 Mike Fährmann
+# Copyright 2015-2023 Mike Fährmann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -17,22 +17,17 @@ class _3dbooruBase():
     basecategory = "booru"
     root = "http://behoimi.org"
 
-    def __init__(self, match):
-        super().__init__(match)
-        self.session.headers.update({
-            "Referer": "http://behoimi.org/post/show/",
-            "Accept-Encoding": "identity",
-        })
+    def _init(self):
+        headers = self.session.headers
+        headers["Referer"] = "http://behoimi.org/post/show/"
+        headers["Accept-Encoding"] = "identity"
 
 
 class _3dbooruTagExtractor(_3dbooruBase, moebooru.MoebooruTagExtractor):
     """Extractor for images from behoimi.org based on search-tags"""
     pattern = (r"(?:https?://)?(?:www\.)?behoimi\.org/post"
                r"(?:/(?:index)?)?\?tags=(?P<tags>[^&#]+)")
-    test = ("http://behoimi.org/post?tags=himekawa_azuru+dress", {
-        "url": "ecb30c6aaaf8a6ff8f55255737a9840832a483c1",
-        "content": "11cbda40c287e026c1ce4ca430810f761f2d0b2a",
-    })
+    example = "http://behoimi.org/post?tags=TAG"
 
     def posts(self):
         params = {"tags": self.tags}
@@ -42,10 +37,7 @@ class _3dbooruTagExtractor(_3dbooruBase, moebooru.MoebooruTagExtractor):
 class _3dbooruPoolExtractor(_3dbooruBase, moebooru.MoebooruPoolExtractor):
     """Extractor for image-pools from behoimi.org"""
     pattern = r"(?:https?://)?(?:www\.)?behoimi\.org/pool/show/(?P<pool>\d+)"
-    test = ("http://behoimi.org/pool/show/27", {
-        "url": "da75d2d1475449d5ef0c266cb612683b110a30f2",
-        "content": "fd5b37c5c6c2de4b4d6f1facffdefa1e28176554",
-    })
+    example = "http://behoimi.org/pool/show/12345"
 
     def posts(self):
         params = {"tags": "pool:" + self.pool_id}
@@ -55,17 +47,7 @@ class _3dbooruPoolExtractor(_3dbooruBase, moebooru.MoebooruPoolExtractor):
 class _3dbooruPostExtractor(_3dbooruBase, moebooru.MoebooruPostExtractor):
     """Extractor for single images from behoimi.org"""
     pattern = r"(?:https?://)?(?:www\.)?behoimi\.org/post/show/(?P<post>\d+)"
-    test = ("http://behoimi.org/post/show/140852", {
-        "url": "ce874ea26f01d6c94795f3cc3aaaaa9bc325f2f6",
-        "content": "26549d55b82aa9a6c1686b96af8bfcfa50805cd4",
-        "options": (("tags", True),),
-        "keyword": {
-            "tags_character": "furude_rika",
-            "tags_copyright": "higurashi_no_naku_koro_ni",
-            "tags_model": "himekawa_azuru",
-            "tags_general": str,
-        },
-    })
+    example = "http://behoimi.org/post/show/12345"
 
     def posts(self):
         params = {"tags": "id:" + self.post_id}
@@ -78,7 +60,4 @@ class _3dbooruPopularExtractor(
     pattern = (r"(?:https?://)?(?:www\.)?behoimi\.org"
                r"/post/popular_(?P<scale>by_(?:day|week|month)|recent)"
                r"(?:\?(?P<query>[^#]*))?")
-    test = ("http://behoimi.org/post/popular_by_month?month=2&year=2013", {
-        "pattern": r"http://behoimi\.org/data/../../[0-9a-f]{32}\.jpg",
-        "count": 20,
-    })
+    example = "http://behoimi.org/post/popular_by_month"