replace standard library 're' uses with 'util.re()'

test/results/batoto.py

@@ -10,7 +10,6 @@ from gallery_dl import exception
 __tests__ = (
 {
     "#url"     : "https://bato.to/title/86408-i-shall-master-this-family-official/1681030-ch_8",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
     "#count"   : 66,
 
@@ -33,7 +32,6 @@ __tests__ = (
 {
     "#url"     : "https://bato.to/title/104929-86-eighty-six-official/1943513-vol_1-ch_5",
     "#comment" : "volume (vol) in url",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
     "#count"   : 7,
 
@@ -46,7 +44,6 @@ __tests__ = (
 {
     "#url"     : "https://mto.to/chapter/2584460",
     "#comment" : "'-' in manga title (#5200)",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 
     "chapter"   : 9,
@@ -64,7 +61,6 @@ __tests__ = (
 {
     "#url"     : "https://bato.to/title/90710-new-suitor-for-the-abandoned-wife/2089747-ch_76",
     "#comment" : "duplicate info in chapter_minor / title (#5988)",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 
     "chapter"      : 76,
@@ -76,7 +72,6 @@ __tests__ = (
 
 {
     "#url"     : "https://bato.to/title/115494-today-with-you/2631897-ch_38",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 
     "chapter"       : 37,
@@ -94,20 +89,17 @@ __tests__ = (
 
 {
     "#url"     : "https://bato.to/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
     "#url"     : "https://bato.to/chapter/1681030",
     "#comment" : "v2 URL",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
     "#url"     : "https://bato.to/title/113742-futsutsuka-na-akujo-de-wa-gozaimasu-ga-suuguu-chouso-torikae-den-official",
-    "#category": ("", "batoto", "manga"),
     "#class"   : batoto.BatotoMangaExtractor,
     "#options" : {"domain": "xbato.org"},
     "#count"   : ">= 21",
@@ -122,7 +114,6 @@ __tests__ = (
 {
     "#url"     : "https://bato.to/title/104929-86-eighty-six-official",
     "#comment" : "Manga with number in name",
-    "#category": ("", "batoto", "manga"),
     "#class"   : batoto.BatotoMangaExtractor,
     "#count"   : ">= 18",
 
@@ -132,7 +123,6 @@ __tests__ = (
 {
     "#url"     : "https://bato.to/title/140046-the-grand-duke-s-fox-princess-mgchan",
     "#comment" : "Non-English translation (Indonesian)",
-    "#category": ("", "batoto", "manga"),
     "#class"   : batoto.BatotoMangaExtractor,
     "#count"   : ">= 29",
 
@@ -142,149 +132,130 @@ __tests__ = (
 {
     "#url"     : "https://bato.to/title/134270-removed",
     "#comment" : "Deleted/removed manga",
-    "#category": ("", "batoto", "manga"),
     "#class"   : batoto.BatotoMangaExtractor,
     "#exception": exception.StopExtraction,
 },
 
 {
     "#url"     : "https://bato.to/title/86408-i-shall-master-this-family-official",
-    "#category": ("", "batoto", "manga"),
     "#class"   : batoto.BatotoMangaExtractor,
 },
 
 {
     "#url"     : "https://bato.to/series/86408/i-shall-master-this-family-official",
     "#comment" : "v2 URL",
-    "#category": ("", "batoto", "manga"),
     "#class"   : batoto.BatotoMangaExtractor,
 },
 
 {
     "#url"     : "https://dto.to/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://fto.to/title/86408/1681030",
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://hto.to/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
+    "#class"   : batoto.BatotoChapterExtractor,
+},
+{
+    "#url"     : "https://jto.to/title/86408/1681030",
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://mto.to/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://wto.to/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
     "#url"     : "https://mangatoto.com/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://mangatoto.net/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://mangatoto.org/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
     "#url"     : "https://batocomic.com/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://batocomic.net/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://batocomic.org/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
     "#url"     : "https://readtoto.com/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://readtoto.net/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://readtoto.org/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
     "#url"     : "https://xbato.com/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://xbato.net/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://xbato.org/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
     "#url"     : "https://zbato.com/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://zbato.net/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://zbato.org/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
     "#url"     : "https://comiko.net/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://comiko.org/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 
 {
     "#url"     : "https://batotoo.com/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://batotwo.com/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },
 {
     "#url"     : "https://battwo.com/title/86408/1681030",
-    "#category": ("", "batoto", "chapter"),
     "#class"   : batoto.BatotoChapterExtractor,
 },