New upstream version 1.26.0.upstream/1.26.0

1 files changed, 4 insertions, 84 deletions

diff --git a/gallery_dl/extractor/paheal.py b/gallery_dl/extractor/paheal.py
index 1fa571c..0389ead 100644
--- a/gallery_dl/extractor/paheal.py
+++ b/gallery_dl/extractor/paheal.py
@@ -21,7 +21,7 @@ class PahealExtractor(Extractor):
     root = "https://rule34.paheal.net"
 
     def items(self):
-        self.session.cookies.set(
+        self.cookies.set(
             "ui-tnc-agreed", "true", domain="rule34.paheal.net")
         data = self.get_metadata()
 
@@ -74,40 +74,14 @@ class PahealTagExtractor(PahealExtractor):
     directory_fmt = ("{category}", "{search_tags}")
     pattern = (r"(?:https?://)?(?:rule34|rule63|cosplay)\.paheal\.net"
                r"/post/list/([^/?#]+)")
-    test = (
-        ("https://rule34.paheal.net/post/list/Ayane_Suzuki/1", {
-            "pattern": r"https://[^.]+\.paheal\.net/_images/\w+/\d+%20-%20",
-            "count": ">= 15"
-        }),
-        ("https://rule34.paheal.net/post/list/Ayane_Suzuki/1", {
-            "range": "1",
-            "options": (("metadata", True),),
-            "keyword": {
-                "date": "dt:2018-01-07 07:04:05",
-                "duration": 0.0,
-                "extension": "jpg",
-                "filename": "2446128 - Ayane_Suzuki Idolmaster "
-                            "idolmaster_dearly_stars Zanzi",
-                "height": 768,
-                "id": 2446128,
-                "md5": "b0ceda9d860df1d15b60293a7eb465c1",
-                "search_tags": "Ayane_Suzuki",
-                "size": 205312,
-                "source": "https://www.pixiv.net/member_illust.php"
-                          "?mode=medium&illust_id=19957280",
-                "tags": "Ayane_Suzuki Idolmaster "
-                        "idolmaster_dearly_stars Zanzi",
-                "uploader": "XXXname",
-                "width": 1024,
-            },
-        }),
-    )
+    example = "https://rule34.paheal.net/post/list/TAG/1"
     per_page = 70
 
     def __init__(self, match):
         PahealExtractor.__init__(self, match)
         self.tags = text.unquote(match.group(1))
 
+    def _init(self):
         if self.config("metadata"):
             self._extract_data = self._extract_data_ex
 
@@ -160,61 +134,7 @@ class PahealPostExtractor(PahealExtractor):
     subcategory = "post"
     pattern = (r"(?:https?://)?(?:rule34|rule63|cosplay)\.paheal\.net"
                r"/post/view/(\d+)")
-    test = (
-        ("https://rule34.paheal.net/post/view/481609", {
-            "pattern": r"https://tulip\.paheal\.net/_images"
-                       r"/bbdc1c33410c2cdce7556c7990be26b7/481609%20-%20"
-                       r"Azumanga_Daioh%20inanimate%20Osaka%20Vuvuzela\.jpg",
-            "content": "7b924bcf150b352ac75c9d281d061e174c851a11",
-            "keyword": {
-                "date": "dt:2010-06-17 15:40:23",
-                "extension": "jpg",
-                "file_url": "re:https://tulip.paheal.net/_images/bbdc1c33410c",
-                "filename": "481609 - Azumanga_Daioh inanimate Osaka Vuvuzela",
-                "height": 660,
-                "id": 481609,
-                "md5": "bbdc1c33410c2cdce7556c7990be26b7",
-                "size": 157389,
-                "source": "",
-                "tags": "Azumanga_Daioh inanimate Osaka Vuvuzela",
-                "uploader": "CaptainButtface",
-                "width": 614,
-            },
-        }),
-        ("https://rule34.paheal.net/post/view/488534", {
-            "keyword": {
-                "date": "dt:2010-06-25 13:51:17",
-                "height": 800,
-                "md5": "b39edfe455a0381110c710d6ed2ef57d",
-                "size": 758989,
-                "source": "http://www.furaffinity.net/view/4057821/",
-                "tags": "inanimate thelost-dragon Vuvuzela",
-                "uploader": "leacheate_soup",
-                "width": 1200,
-            },
-        }),
-        # video
-        ("https://rule34.paheal.net/post/view/3864982", {
-            "pattern": r"https://[\w]+\.paheal\.net/_images/7629fc0ff77e32637d"
-                       r"de5bf4f992b2cb/3864982%20-%20animated%20Metal_Gear%20"
-                       r"Metal_Gear_Solid_V%20Quiet%20Vg_erotica%20webm\.webm",
-            "keyword": {
-                "date": "dt:2020-09-06 01:59:03",
-                "duration": 30.0,
-                "extension": "webm",
-                "height": 2500,
-                "id": 3864982,
-                "md5": "7629fc0ff77e32637dde5bf4f992b2cb",
-                "size": 18454938,
-                "source": "https://twitter.com/VG_Worklog"
-                          "/status/1302407696294055936",
-                "tags": "animated Metal_Gear Metal_Gear_Solid_V "
-                        "Quiet Vg_erotica webm",
-                "uploader": "justausername",
-                "width": 1768,
-            },
-        }),
-    )
+    example = "https://rule34.paheal.net/post/view/12345"
 
     def __init__(self, match):
         PahealExtractor.__init__(self, match)