From 539faa0322edab81ec02efe1e7df8a84f4ad7edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Mon, 5 Oct 2015 17:15:31 +0200 Subject: [PATCH] remove SequentialExtractor class --- gallery_dl/extractor/booru.py | 6 +++--- gallery_dl/extractor/chan.py | 6 +++--- gallery_dl/extractor/common.py | 6 ------ gallery_dl/extractor/imgchili.py | 6 +++--- gallery_dl/extractor/pixiv.py | 6 +++--- gallery_dl/extractor/redhawkscans.py | 6 +++--- 6 files changed, 15 insertions(+), 21 deletions(-) diff --git a/gallery_dl/extractor/booru.py b/gallery_dl/extractor/booru.py index 14629fd6..b478cb75 100644 --- a/gallery_dl/extractor/booru.py +++ b/gallery_dl/extractor/booru.py @@ -8,19 +8,19 @@ """Base classes for extractors for danbooru and co""" -from .common import SequentialExtractor, Message +from .common import Extractor, Message from .. import text import xml.etree.ElementTree as ET import json import os.path import urllib.parse -class BooruExtractor(SequentialExtractor): +class BooruExtractor(Extractor): api_url = "" def __init__(self, match, info): - SequentialExtractor.__init__(self) + Extractor.__init__(self) self.info = info self.tags = text.unquote(match.group(1)) self.page = "page" diff --git a/gallery_dl/extractor/chan.py b/gallery_dl/extractor/chan.py index c6389314..2d3b9936 100644 --- a/gallery_dl/extractor/chan.py +++ b/gallery_dl/extractor/chan.py @@ -8,16 +8,16 @@ """Base classes for extractors for different Futaba Channel boards""" -from .common import SequentialExtractor, Message +from .common import Extractor, Message from .. import text -class ChanExtractor(SequentialExtractor): +class ChanExtractor(Extractor): api_url = "" file_url = "" def __init__(self, category, board, thread): - SequentialExtractor.__init__(self) + Extractor.__init__(self) self.metadata = { "category": category, "board": board, diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py index 4d5b96a9..7dc39a52 100644 --- a/gallery_dl/extractor/common.py +++ b/gallery_dl/extractor/common.py @@ -45,12 +45,6 @@ class Extractor(): ) -class SequentialExtractor(Extractor): - - def __init__(self): - Extractor.__init__(self) - - class AsynchronousExtractor(Extractor): def __init__(self): diff --git a/gallery_dl/extractor/imgchili.py b/gallery_dl/extractor/imgchili.py index 8d164764..d913a0d3 100644 --- a/gallery_dl/extractor/imgchili.py +++ b/gallery_dl/extractor/imgchili.py @@ -8,7 +8,7 @@ """Extract images from albums at http://imgchili.net/""" -from .common import SequentialExtractor, Message +from .common import Extractor, Message from .. import text import re @@ -22,10 +22,10 @@ info = { ], } -class ImgchiliExtractor(SequentialExtractor): +class ImgchiliExtractor(Extractor): def __init__(self, match): - SequentialExtractor.__init__(self) + Extractor.__init__(self) self.match = match self.num = 0 diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py index 4b1deb13..713bcffb 100644 --- a/gallery_dl/extractor/pixiv.py +++ b/gallery_dl/extractor/pixiv.py @@ -8,7 +8,7 @@ """Extract images and ugoira from http://www.pixiv.net/""" -from .common import SequentialExtractor, Message +from .common import Extractor, Message from .. import config, text import re import json @@ -24,13 +24,13 @@ info = { } -class PixivExtractor(SequentialExtractor): +class PixivExtractor(Extractor): member_url = "http://www.pixiv.net/member_illust.php" illust_url = "http://www.pixiv.net/member_illust.php?mode=medium" def __init__(self, match): - SequentialExtractor.__init__(self) + Extractor.__init__(self) self.artist_id = match.group(1) self.api = PixivAPI(self.session) diff --git a/gallery_dl/extractor/redhawkscans.py b/gallery_dl/extractor/redhawkscans.py index 4138ea3b..5b0a857e 100644 --- a/gallery_dl/extractor/redhawkscans.py +++ b/gallery_dl/extractor/redhawkscans.py @@ -8,7 +8,7 @@ """Extract manga pages from http://manga.redhawkscans.com/""" -from .common import SequentialExtractor, Message +from .common import Extractor, Message from .. import text import os.path import json @@ -24,12 +24,12 @@ info = { ], } -class RedHawkScansExtractor(SequentialExtractor): +class RedHawkScansExtractor(Extractor): url_base = "https://manga.redhawkscans.com/reader/read/" def __init__(self, match): - SequentialExtractor.__init__(self) + Extractor.__init__(self) self.part = match.group(1) def items(self):