From 0e46db6f457448e7e61f1dc760f8fa9e32d97e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 8 Feb 2019 11:43:40 +0100 Subject: [PATCH] rename some base classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They shouldn't be called …Extractor if they don't have 'Extractor' as their base class. --- gallery_dl/extractor/hbrowse.py | 6 +++--- gallery_dl/extractor/mangapark.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gallery_dl/extractor/hbrowse.py b/gallery_dl/extractor/hbrowse.py index aae331b6..774b0de8 100644 --- a/gallery_dl/extractor/hbrowse.py +++ b/gallery_dl/extractor/hbrowse.py @@ -13,7 +13,7 @@ from .. import text, exception import json -class HbrowseExtractor(): +class HbrowseBase(): """Base class for hbrowse extractors""" category = "hbrowse" root = "https://www.hbrowse.com" @@ -42,7 +42,7 @@ class HbrowseExtractor(): return data -class HbrowseMangaExtractor(HbrowseExtractor, MangaExtractor): +class HbrowseMangaExtractor(HbrowseBase, MangaExtractor): """Extractor for manga from hbrowse.com""" pattern = [r"(?:https?://)?((?:www\.)?hbrowse\.com/\d+)/?$"] reverse = False @@ -70,7 +70,7 @@ class HbrowseMangaExtractor(HbrowseExtractor, MangaExtractor): results.append((text.urljoin(self.root, url), data.copy())) -class HbrowseChapterExtractor(HbrowseExtractor, ChapterExtractor): +class HbrowseChapterExtractor(HbrowseBase, ChapterExtractor): """Extractor for manga-chapters from hbrowse.com""" directory_fmt = ["{category}", "{manga_id} {manga}", "c{chapter:>05}"] filename_fmt = ("{category}_{manga_id}_{chapter:>05}_" diff --git a/gallery_dl/extractor/mangapark.py b/gallery_dl/extractor/mangapark.py index 375535db..cbe0483c 100644 --- a/gallery_dl/extractor/mangapark.py +++ b/gallery_dl/extractor/mangapark.py @@ -13,7 +13,7 @@ from .. import text, exception import json -class MangaparkExtractor(): +class MangaparkBase(): """Base class for mangapark extractors""" category = "mangapark" root_fmt = "https://mangapark.{}" @@ -38,7 +38,7 @@ class MangaparkExtractor(): data["chapter_minor"] = "v" + value -class MangaparkMangaExtractor(MangaparkExtractor, MangaExtractor): +class MangaparkMangaExtractor(MangaparkBase, MangaExtractor): """Extractor for manga from mangapark.me""" pattern = [r"(?:https?://)?(?:www\.)?mangapark\.(me|net|com)" r"(/manga/[^/?&#]+)/?$"] @@ -77,7 +77,7 @@ class MangaparkMangaExtractor(MangaparkExtractor, MangaExtractor): return results -class MangaparkChapterExtractor(MangaparkExtractor, ChapterExtractor): +class MangaparkChapterExtractor(MangaparkBase, ChapterExtractor): """Extractor for manga-chapters from mangapark.me""" pattern = [(r"(?:https?://)?(?:www\.)?mangapark\.(me|net|com)" r"/manga/([^?&#]+/i\d+)")]