simplify extractor constants

- single strings for URL patterns
- tuples instead of lists for 'directory_fmt' and 'test'
- single-tuple tests where applicable

gallery_dl/extractor/yandere.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2015-2018 Mike Fährmann
+# Copyright 2015-2019 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
@@ -20,25 +20,25 @@ class YandereExtractor(booru.MoebooruPageMixin, booru.BooruExtractor):
 
 class YandereTagExtractor(booru.TagMixin, YandereExtractor):
     """Extractor for images from yande.re based on search-tags"""
-    pattern = [r"(?:https?://)?(?:www\.)?yande\.re"
-               r"/post\?(?:[^&#]*&)*tags=(?P<tags>[^&#]+)"]
-    test = [("https://yande.re/post?tags=ouzoku+armor", {
+    pattern = (r"(?:https?://)?(?:www\.)?yande\.re"
+               r"/post\?(?:[^&#]*&)*tags=(?P<tags>[^&#]+)")
+    test = ("https://yande.re/post?tags=ouzoku+armor", {
         "content": "59201811c728096b2d95ce6896fd0009235fe683",
-    })]
+    })
 
 
 class YanderePoolExtractor(booru.PoolMixin, YandereExtractor):
     """Extractor for image-pools from yande.re"""
-    pattern = [r"(?:https?://)?(?:www\.)?yande\.re/pool/show/(?P<pool>\d+)"]
-    test = [("https://yande.re/pool/show/318", {
+    pattern = r"(?:https?://)?(?:www\.)?yande\.re/pool/show/(?P<pool>\d+)"
+    test = ("https://yande.re/pool/show/318", {
         "content": "2a35b9d6edecce11cc2918c6dce4de2198342b68",
-    })]
+    })
 
 
 class YanderePostExtractor(booru.PostMixin, YandereExtractor):
     """Extractor for single images from yande.re"""
-    pattern = [r"(?:https?://)?(?:www\.)?yande\.re/post/show/(?P<post>\d+)"]
-    test = [("https://yande.re/post/show/51824", {
+    pattern = r"(?:https?://)?(?:www\.)?yande\.re/post/show/(?P<post>\d+)"
+    test = ("https://yande.re/post/show/51824", {
         "content": "59201811c728096b2d95ce6896fd0009235fe683",
         "options": (("tags", True),),
         "keyword": {
@@ -47,20 +47,20 @@ class YanderePostExtractor(booru.PostMixin, YandereExtractor):
             "tags_copyright": "ouzoku",
             "tags_general": str,
         },
-    })]
+    })
 
 
 class YanderePopularExtractor(booru.MoebooruPopularMixin, YandereExtractor):
     """Extractor for popular images from yande.re"""
-    pattern = [r"(?:https?://)?(?:www\.)?yande\.re"
+    pattern = (r"(?:https?://)?(?:www\.)?yande\.re"
                r"/post/popular_(?P<scale>by_(?:day|week|month)|recent)"
-               r"(?:\?(?P<query>[^#]*))?"]
-    test = [
+               r"(?:\?(?P<query>[^#]*))?")
+    test = (
         ("https://yande.re/post/popular_by_month?month=6&year=2014", {
             "count": 40,
         }),
-        ("https://yande.re/post/popular_recent", None),
-    ]
+        ("https://yande.re/post/popular_recent"),
+    )
 
     def __init__(self, match):
         super().__init__(match)