From edd089237e71a8ca5b93941112c8d737a95f57b1 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 25 Jan 2021 20:53:04 -0600 Subject: [PATCH] Remove unused imports adapters --- fanficfare/adapters/__init__.py | 4 +--- fanficfare/adapters/adapter_adastrafanficcom.py | 2 -- fanficfare/adapters/adapter_adultfanfictionorg.py | 3 --- fanficfare/adapters/adapter_andromedawebcom.py | 1 - fanficfare/adapters/adapter_archiveofourownorg.py | 1 - fanficfare/adapters/adapter_archiveskyehawkecom.py | 3 --- fanficfare/adapters/adapter_asexstoriescom.py | 5 ----- fanficfare/adapters/adapter_ashwindersycophanthexcom.py | 1 - fanficfare/adapters/adapter_asianfanficscom.py | 2 -- fanficfare/adapters/adapter_bdsmlibrarycom.py | 2 -- fanficfare/adapters/adapter_bloodshedversecom.py | 4 ---- fanficfare/adapters/adapter_bloodtiesfancom.py | 1 - fanficfare/adapters/adapter_buffygilescom.py | 1 - fanficfare/adapters/adapter_chaossycophanthexcom.py | 1 - fanficfare/adapters/adapter_chireadscom.py | 3 --- fanficfare/adapters/adapter_chosentwofanficcom.py | 2 -- fanficfare/adapters/adapter_csiforensicscom.py | 2 -- fanficfare/adapters/adapter_deandamagecom.py | 1 - fanficfare/adapters/adapter_deepinmysoulnet.py | 1 - fanficfare/adapters/adapter_destinysgatewaycom.py | 1 - fanficfare/adapters/adapter_dokugacom.py | 2 -- fanficfare/adapters/adapter_dracoandginnycom.py | 1 - fanficfare/adapters/adapter_efpfanficnet.py | 2 -- fanficfare/adapters/adapter_erosnsapphosycophanthexcom.py | 1 - fanficfare/adapters/adapter_faeriearchivecom.py | 1 - fanficfare/adapters/adapter_fanficauthorsnet.py | 3 --- fanficfare/adapters/adapter_fanficcastletvnet.py | 1 - fanficfare/adapters/adapter_fanfichu.py | 2 -- fanficfare/adapters/adapter_fanficsme.py | 3 --- fanficfare/adapters/adapter_fanfictalkcom.py | 2 -- fanficfare/adapters/adapter_fanfictionjunkiesde.py | 2 -- fanficfare/adapters/adapter_fanfictionnet.py | 3 +-- fanficfare/adapters/adapter_fanfiktionde.py | 3 --- fanficfare/adapters/adapter_fastnovelnet.py | 3 --- fanficfare/adapters/adapter_ficbooknet.py | 2 -- fanficfare/adapters/adapter_fictionalleyorg.py | 3 --- fanficfare/adapters/adapter_fictionhuntcom.py | 2 -- fanficfare/adapters/adapter_fictionlive.py | 1 - fanficfare/adapters/adapter_fictionmaniatv.py | 1 - fanficfare/adapters/adapter_fictionpadcom.py | 1 - fanficfare/adapters/adapter_fictionpresscom.py | 2 -- fanficfare/adapters/adapter_ficwadcom.py | 1 - fanficfare/adapters/adapter_fimfictionnet.py | 1 - fanficfare/adapters/adapter_finestoriescom.py | 1 - fanficfare/adapters/adapter_fireflyfansnet.py | 2 -- fanficfare/adapters/adapter_forumquestionablequestingcom.py | 1 - fanficfare/adapters/adapter_harrypotterfanfictioncom.py | 4 +--- fanficfare/adapters/adapter_hentaifoundrycom.py | 2 -- fanficfare/adapters/adapter_hlfictionnet.py | 1 - fanficfare/adapters/adapter_hpfanficarchivecom.py | 1 - fanficfare/adapters/adapter_iketernalnet.py | 1 - fanficfare/adapters/adapter_imagineeficcom.py | 1 - fanficfare/adapters/adapter_inkbunnynet.py | 5 ----- fanficfare/adapters/adapter_ksarchivecom.py | 1 - fanficfare/adapters/adapter_lcfanficcom.py | 2 -- fanficfare/adapters/adapter_literotica.py | 1 - fanficfare/adapters/adapter_lotrgficcom.py | 2 -- fanficfare/adapters/adapter_lumossycophanthexcom.py | 1 - fanficfare/adapters/adapter_masseffect2in.py | 1 - fanficfare/adapters/adapter_mcstoriescom.py | 3 --- fanficfare/adapters/adapter_mediaminerorg.py | 2 -- fanficfare/adapters/adapter_merlinficdtwinscouk.py | 1 - fanficfare/adapters/adapter_midnightwhispers.py | 1 - fanficfare/adapters/adapter_mttjustoncenet.py | 1 - fanficfare/adapters/adapter_mugglenetfanfictioncom.py | 1 - fanficfare/adapters/adapter_narutoficorg.py | 1 - fanficfare/adapters/adapter_novelonlinefullcom.py | 5 +---- fanficfare/adapters/adapter_noveltrovecom.py | 4 ---- fanficfare/adapters/adapter_occlumencysycophanthexcom.py | 1 - fanficfare/adapters/adapter_phoenixsongnet.py | 2 -- fanficfare/adapters/adapter_ponyfictionarchivenet.py | 1 - fanficfare/adapters/adapter_potionsandsnitches.py | 2 -- fanficfare/adapters/adapter_potterficscom.py | 1 - fanficfare/adapters/adapter_potterheadsanonymouscom.py | 1 - fanficfare/adapters/adapter_pretendercentrecom.py | 1 - fanficfare/adapters/adapter_qafficcom.py | 1 - fanficfare/adapters/adapter_quotevcom.py | 1 - fanficfare/adapters/adapter_royalroadcom.py | 2 -- fanficfare/adapters/adapter_samandjacknet.py | 2 -- fanficfare/adapters/adapter_scarvesandcoffeenet.py | 1 - fanficfare/adapters/adapter_scifistoriescom.py | 1 - fanficfare/adapters/adapter_scribblehubcom.py | 1 - fanficfare/adapters/adapter_sheppardweircom.py | 1 - fanficfare/adapters/adapter_shriftweborgbfa.py | 4 ---- fanficfare/adapters/adapter_silmarillionwritersguildorg.py | 3 --- fanficfare/adapters/adapter_siyecouk.py | 2 -- fanficfare/adapters/adapter_spikeluvercom.py | 2 -- fanficfare/adapters/adapter_squidgeorgpeja.py | 1 - fanficfare/adapters/adapter_starskyhutcharchivenet.py | 1 - fanficfare/adapters/adapter_starslibrarynet.py | 1 - fanficfare/adapters/adapter_storiesofardacom.py | 2 -- fanficfare/adapters/adapter_storiesonlinenet.py | 2 -- fanficfare/adapters/adapter_sugarquillnet.py | 3 --- fanficfare/adapters/adapter_swiorgru.py | 6 +----- fanficfare/adapters/adapter_swordborderlineangelcom.py | 1 - fanficfare/adapters/adapter_tasteofpoisoninkubationnet.py | 1 - fanficfare/adapters/adapter_tenhawkpresents.py | 2 -- fanficfare/adapters/adapter_thedelphicexpansecom.py | 1 - fanficfare/adapters/adapter_themasquenet.py | 1 - fanficfare/adapters/adapter_thepetulantpoetesscom.py | 1 - fanficfare/adapters/adapter_thesietchcom.py | 1 - fanficfare/adapters/adapter_thundercatsfansorg.py | 1 - fanficfare/adapters/adapter_tomparisdormcom.py | 3 --- fanficfare/adapters/adapter_trekfanfictionnet.py | 2 -- fanficfare/adapters/adapter_trekiverseorg.py | 2 -- fanficfare/adapters/adapter_tthfanficorg.py | 2 -- fanficfare/adapters/adapter_twilightednet.py | 2 -- fanficfare/adapters/adapter_voracity2eficcom.py | 1 - fanficfare/adapters/adapter_walkingtheplankorg.py | 1 - fanficfare/adapters/adapter_webnovelcom.py | 1 - fanficfare/adapters/adapter_whoficcom.py | 2 -- fanficfare/adapters/adapter_wolverineandroguecom.py | 1 - fanficfare/adapters/adapter_wraithbaitcom.py | 2 -- fanficfare/adapters/adapter_wuxiaworldco.py | 2 -- fanficfare/adapters/adapter_wuxiaworldcom.py | 2 -- fanficfare/adapters/adapter_wuxiaworldsite.py | 2 -- fanficfare/adapters/adapter_wwwaneroticstorycom.py | 6 ------ fanficfare/adapters/adapter_wwwlushstoriescom.py | 3 --- fanficfare/adapters/adapter_wwwnovelallcom.py | 5 +---- fanficfare/adapters/adapter_wwwutopiastoriescom.py | 2 -- fanficfare/adapters/base_adapter.py | 2 -- fanficfare/adapters/base_efiction_adapter.py | 1 - fanficfare/adapters/base_xenforo2forum_adapter.py | 3 --- fanficfare/adapters/base_xenforoforum_adapter.py | 1 - 124 files changed, 6 insertions(+), 227 deletions(-) diff --git a/fanficfare/adapters/__init__.py b/fanficfare/adapters/__init__.py index fa232d61..cd9b8e86 100644 --- a/fanficfare/adapters/__init__.py +++ b/fanficfare/adapters/__init__.py @@ -16,12 +16,10 @@ # from __future__ import absolute_import -import os, re, sys, glob, types -from os.path import dirname, basename, normpath +import os, re, sys, types import logging # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves.urllib.parse import urlparse logger = logging.getLogger(__name__) diff --git a/fanficfare/adapters/adapter_adastrafanficcom.py b/fanficfare/adapters/adapter_adastrafanficcom.py index d77210a5..0c37c908 100644 --- a/fanficfare/adapters/adapter_adastrafanficcom.py +++ b/fanficfare/adapters/adapter_adastrafanficcom.py @@ -26,8 +26,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six import string_types as basestring -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_adultfanfictionorg.py b/fanficfare/adapters/adapter_adultfanfictionorg.py index b556daa7..b10a1f47 100644 --- a/fanficfare/adapters/adapter_adultfanfictionorg.py +++ b/fanficfare/adapters/adapter_adultfanfictionorg.py @@ -22,15 +22,12 @@ from __future__ import unicode_literals import logging logger = logging.getLogger(__name__) import re -import sys -from bs4 import UnicodeDammit from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_andromedawebcom.py b/fanficfare/adapters/adapter_andromedawebcom.py index 2dfacf7f..63949767 100644 --- a/fanficfare/adapters/adapter_andromedawebcom.py +++ b/fanficfare/adapters/adapter_andromedawebcom.py @@ -27,7 +27,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_archiveofourownorg.py b/fanficfare/adapters/adapter_archiveofourownorg.py index 90350d67..83efb047 100644 --- a/fanficfare/adapters/adapter_archiveofourownorg.py +++ b/fanficfare/adapters/adapter_archiveofourownorg.py @@ -25,7 +25,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_archiveskyehawkecom.py b/fanficfare/adapters/adapter_archiveskyehawkecom.py index 2400dcc3..75e59887 100644 --- a/fanficfare/adapters/adapter_archiveskyehawkecom.py +++ b/fanficfare/adapters/adapter_archiveskyehawkecom.py @@ -18,13 +18,10 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) -import re from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_asexstoriescom.py b/fanficfare/adapters/adapter_asexstoriescom.py index 4916ec33..34513737 100644 --- a/fanficfare/adapters/adapter_asexstoriescom.py +++ b/fanficfare/adapters/adapter_asexstoriescom.py @@ -18,18 +18,13 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) -import re import os from bs4.element import Comment -from ..htmlcleanup import stripHTML from .. import exceptions as exceptions -import sys # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_ashwindersycophanthexcom.py b/fanficfare/adapters/adapter_ashwindersycophanthexcom.py index 5baf7738..b7646d85 100644 --- a/fanficfare/adapters/adapter_ashwindersycophanthexcom.py +++ b/fanficfare/adapters/adapter_ashwindersycophanthexcom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_asianfanficscom.py b/fanficfare/adapters/adapter_asianfanficscom.py index aeebb8c4..3588b89c 100644 --- a/fanficfare/adapters/adapter_asianfanficscom.py +++ b/fanficfare/adapters/adapter_asianfanficscom.py @@ -9,8 +9,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_bdsmlibrarycom.py b/fanficfare/adapters/adapter_bdsmlibrarycom.py index fd4e4cda..5dfba911 100644 --- a/fanficfare/adapters/adapter_bdsmlibrarycom.py +++ b/fanficfare/adapters/adapter_bdsmlibrarycom.py @@ -50,7 +50,6 @@ import time import logging logger = logging.getLogger(__name__) import re -import urllib import sys from bs4 import Comment from ..htmlcleanup import stripHTML @@ -59,7 +58,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_bloodshedversecom.py b/fanficfare/adapters/adapter_bloodshedversecom.py index b4dc1386..e487451b 100644 --- a/fanficfare/adapters/adapter_bloodshedversecom.py +++ b/fanficfare/adapters/adapter_bloodshedversecom.py @@ -1,17 +1,13 @@ from __future__ import absolute_import -from datetime import timedelta import re import logging logger = logging.getLogger(__name__) -from bs4 import BeautifulSoup from ..htmlcleanup import stripHTML # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from .. import exceptions diff --git a/fanficfare/adapters/adapter_bloodtiesfancom.py b/fanficfare/adapters/adapter_bloodtiesfancom.py index 973cdb0e..80ca7dd4 100644 --- a/fanficfare/adapters/adapter_bloodtiesfancom.py +++ b/fanficfare/adapters/adapter_bloodtiesfancom.py @@ -26,7 +26,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_buffygilescom.py b/fanficfare/adapters/adapter_buffygilescom.py index 176a873a..f13baa71 100644 --- a/fanficfare/adapters/adapter_buffygilescom.py +++ b/fanficfare/adapters/adapter_buffygilescom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_chaossycophanthexcom.py b/fanficfare/adapters/adapter_chaossycophanthexcom.py index ccd8a4f5..ffd2a2da 100644 --- a/fanficfare/adapters/adapter_chaossycophanthexcom.py +++ b/fanficfare/adapters/adapter_chaossycophanthexcom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_chireadscom.py b/fanficfare/adapters/adapter_chireadscom.py index 7eecec89..a29230b7 100644 --- a/fanficfare/adapters/adapter_chireadscom.py +++ b/fanficfare/adapters/adapter_chireadscom.py @@ -20,9 +20,6 @@ from __future__ import absolute_import import logging import re # py2 vs py3 transition -from ..six import text_type as unicode, ensure_text -from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from fanficfare.htmlcleanup import stripHTML diff --git a/fanficfare/adapters/adapter_chosentwofanficcom.py b/fanficfare/adapters/adapter_chosentwofanficcom.py index e4999008..2d56071e 100644 --- a/fanficfare/adapters/adapter_chosentwofanficcom.py +++ b/fanficfare/adapters/adapter_chosentwofanficcom.py @@ -20,7 +20,6 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import sys from bs4.element import Comment from ..htmlcleanup import stripHTML @@ -28,7 +27,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_csiforensicscom.py b/fanficfare/adapters/adapter_csiforensicscom.py index e0715bc8..bf0a9d6e 100644 --- a/fanficfare/adapters/adapter_csiforensicscom.py +++ b/fanficfare/adapters/adapter_csiforensicscom.py @@ -23,8 +23,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_deandamagecom.py b/fanficfare/adapters/adapter_deandamagecom.py index a10cfeb3..c71e8bb9 100644 --- a/fanficfare/adapters/adapter_deandamagecom.py +++ b/fanficfare/adapters/adapter_deandamagecom.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -from ..htmlcleanup import stripHTML # Software: eFiction from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_deepinmysoulnet.py b/fanficfare/adapters/adapter_deepinmysoulnet.py index 35138bfa..4386f103 100644 --- a/fanficfare/adapters/adapter_deepinmysoulnet.py +++ b/fanficfare/adapters/adapter_deepinmysoulnet.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_destinysgatewaycom.py b/fanficfare/adapters/adapter_destinysgatewaycom.py index 35685b43..ec22671a 100644 --- a/fanficfare/adapters/adapter_destinysgatewaycom.py +++ b/fanficfare/adapters/adapter_destinysgatewaycom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_dokugacom.py b/fanficfare/adapters/adapter_dokugacom.py index 395d3bf4..9ccec63e 100644 --- a/fanficfare/adapters/adapter_dokugacom.py +++ b/fanficfare/adapters/adapter_dokugacom.py @@ -23,8 +23,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_dracoandginnycom.py b/fanficfare/adapters/adapter_dracoandginnycom.py index 9b2c3149..0ad907a7 100644 --- a/fanficfare/adapters/adapter_dracoandginnycom.py +++ b/fanficfare/adapters/adapter_dracoandginnycom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_efpfanficnet.py b/fanficfare/adapters/adapter_efpfanficnet.py index 1aa51a9e..d519e222 100644 --- a/fanficfare/adapters/adapter_efpfanficnet.py +++ b/fanficfare/adapters/adapter_efpfanficnet.py @@ -24,8 +24,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_erosnsapphosycophanthexcom.py b/fanficfare/adapters/adapter_erosnsapphosycophanthexcom.py index 91107ed0..e7afdc15 100644 --- a/fanficfare/adapters/adapter_erosnsapphosycophanthexcom.py +++ b/fanficfare/adapters/adapter_erosnsapphosycophanthexcom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_faeriearchivecom.py b/fanficfare/adapters/adapter_faeriearchivecom.py index 72f1a246..06c17c6a 100644 --- a/fanficfare/adapters/adapter_faeriearchivecom.py +++ b/fanficfare/adapters/adapter_faeriearchivecom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fanficauthorsnet.py b/fanficfare/adapters/adapter_fanficauthorsnet.py index 180fa441..2063d82f 100644 --- a/fanficfare/adapters/adapter_fanficauthorsnet.py +++ b/fanficfare/adapters/adapter_fanficauthorsnet.py @@ -23,15 +23,12 @@ from __future__ import unicode_literals import logging logger = logging.getLogger(__name__) import re -import sys -from bs4 import UnicodeDammit, Comment from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fanficcastletvnet.py b/fanficfare/adapters/adapter_fanficcastletvnet.py index 80f31a25..3fa17de0 100644 --- a/fanficfare/adapters/adapter_fanficcastletvnet.py +++ b/fanficfare/adapters/adapter_fanficcastletvnet.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fanfichu.py b/fanficfare/adapters/adapter_fanfichu.py index 6bad7c93..c57e3890 100644 --- a/fanficfare/adapters/adapter_fanfichu.py +++ b/fanficfare/adapters/adapter_fanfichu.py @@ -18,10 +18,8 @@ from __future__ import absolute_import import re # py2 vs py3 transition -from ..six import text_type as unicode from ..six import ensure_text from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from .. import exceptions diff --git a/fanficfare/adapters/adapter_fanficsme.py b/fanficfare/adapters/adapter_fanficsme.py index 5753d64b..188d573a 100644 --- a/fanficfare/adapters/adapter_fanficsme.py +++ b/fanficfare/adapters/adapter_fanficsme.py @@ -19,14 +19,11 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import json from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fanfictalkcom.py b/fanficfare/adapters/adapter_fanfictalkcom.py index e203b005..c1e74920 100644 --- a/fanficfare/adapters/adapter_fanfictalkcom.py +++ b/fanficfare/adapters/adapter_fanfictalkcom.py @@ -24,8 +24,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fanfictionjunkiesde.py b/fanficfare/adapters/adapter_fanfictionjunkiesde.py index 8206bd3f..f31bfc73 100644 --- a/fanficfare/adapters/adapter_fanfictionjunkiesde.py +++ b/fanficfare/adapters/adapter_fanfictionjunkiesde.py @@ -24,8 +24,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fanfictionnet.py b/fanficfare/adapters/adapter_fanfictionnet.py index 58ed3508..e2f7e605 100644 --- a/fanficfare/adapters/adapter_fanfictionnet.py +++ b/fanficfare/adapters/adapter_fanfictionnet.py @@ -29,7 +29,7 @@ from ..six.moves.urllib.parse import urlparse from .. import exceptions as exceptions from ..htmlcleanup import stripHTML -from .base_adapter import BaseSiteAdapter, makeDate +from .base_adapter import BaseSiteAdapter ffnetgenres=["Adventure", "Angst", "Crime", "Drama", "Family", "Fantasy", "Friendship", "General", "Horror", "Humor", "Hurt-Comfort", "Mystery", "Parody", "Poetry", "Romance", "Sci-Fi", @@ -145,7 +145,6 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter): raise e except Exception as e: logger.warning("Caught an exception reading URL: %s Exception %s."%(unicode(url),unicode(e))) - pass # Find authorid and URL from... author url. a = soup.find('a', href=re.compile(r"^/u/\d+")) diff --git a/fanficfare/adapters/adapter_fanfiktionde.py b/fanficfare/adapters/adapter_fanfiktionde.py index 9505b298..1cee9b2e 100644 --- a/fanficfare/adapters/adapter_fanfiktionde.py +++ b/fanficfare/adapters/adapter_fanfiktionde.py @@ -20,14 +20,11 @@ import time import logging logger = logging.getLogger(__name__) import re -import urllib from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fastnovelnet.py b/fanficfare/adapters/adapter_fastnovelnet.py index 630b6b58..44dd25c2 100644 --- a/fanficfare/adapters/adapter_fastnovelnet.py +++ b/fanficfare/adapters/adapter_fastnovelnet.py @@ -23,9 +23,6 @@ from __future__ import absolute_import import logging import re # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_ficbooknet.py b/fanficfare/adapters/adapter_ficbooknet.py index 0f971c25..83cd5e2f 100644 --- a/fanficfare/adapters/adapter_ficbooknet.py +++ b/fanficfare/adapters/adapter_ficbooknet.py @@ -27,8 +27,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fictionalleyorg.py b/fanficfare/adapters/adapter_fictionalleyorg.py index 17574c33..88c012f9 100644 --- a/fanficfare/adapters/adapter_fictionalleyorg.py +++ b/fanficfare/adapters/adapter_fictionalleyorg.py @@ -19,13 +19,10 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import urllib from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fictionhuntcom.py b/fanficfare/adapters/adapter_fictionhuntcom.py index b2720a9a..8aaf9063 100644 --- a/fanficfare/adapters/adapter_fictionhuntcom.py +++ b/fanficfare/adapters/adapter_fictionhuntcom.py @@ -23,8 +23,6 @@ from .. import exceptions as exceptions from ..htmlcleanup import stripHTML # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fictionlive.py b/fanficfare/adapters/adapter_fictionlive.py index 1034e43a..f7e5e720 100644 --- a/fanficfare/adapters/adapter_fictionlive.py +++ b/fanficfare/adapters/adapter_fictionlive.py @@ -39,7 +39,6 @@ from .base_adapter import BaseSiteAdapter from ..htmlcleanup import stripHTML from .. import exceptions as exceptions -from ..six import text_type as unicode, ensure_text def getClass(): return FictionLiveAdapter diff --git a/fanficfare/adapters/adapter_fictionmaniatv.py b/fanficfare/adapters/adapter_fictionmaniatv.py index 811f937f..f2fbdff7 100644 --- a/fanficfare/adapters/adapter_fictionmaniatv.py +++ b/fanficfare/adapters/adapter_fictionmaniatv.py @@ -5,7 +5,6 @@ logger = logging.getLogger(__name__) # py2 vs py3 transition from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fictionpadcom.py b/fanficfare/adapters/adapter_fictionpadcom.py index 1cd76cac..335e0156 100644 --- a/fanficfare/adapters/adapter_fictionpadcom.py +++ b/fanficfare/adapters/adapter_fictionpadcom.py @@ -27,7 +27,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fictionpresscom.py b/fanficfare/adapters/adapter_fictionpresscom.py index 132e291f..1899b9f2 100644 --- a/fanficfare/adapters/adapter_fictionpresscom.py +++ b/fanficfare/adapters/adapter_fictionpresscom.py @@ -18,10 +18,8 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) -import re # py2 vs py3 transition -from ..six import text_type as unicode ## They're from the same people and pretty much identical. from .adapter_fanfictionnet import FanFictionNetSiteAdapter diff --git a/fanficfare/adapters/adapter_ficwadcom.py b/fanficfare/adapters/adapter_ficwadcom.py index 6d6e7895..c1d8321d 100644 --- a/fanficfare/adapters/adapter_ficwadcom.py +++ b/fanficfare/adapters/adapter_ficwadcom.py @@ -25,7 +25,6 @@ from ..htmlcleanup import stripHTML # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_fimfictionnet.py b/fanficfare/adapters/adapter_fimfictionnet.py index dd6f9520..180e8433 100644 --- a/fanficfare/adapters/adapter_fimfictionnet.py +++ b/fanficfare/adapters/adapter_fimfictionnet.py @@ -28,7 +28,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from ..six.moves import http_cookiejar as cl from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_finestoriescom.py b/fanficfare/adapters/adapter_finestoriescom.py index 81be7f5a..e3f6a2d4 100644 --- a/fanficfare/adapters/adapter_finestoriescom.py +++ b/fanficfare/adapters/adapter_finestoriescom.py @@ -20,7 +20,6 @@ import logging logger = logging.getLogger(__name__) # py2 vs py3 transition -from ..six import text_type as unicode from .adapter_storiesonlinenet import StoriesOnlineNetAdapter diff --git a/fanficfare/adapters/adapter_fireflyfansnet.py b/fanficfare/adapters/adapter_fireflyfansnet.py index 50cca03a..495fa126 100644 --- a/fanficfare/adapters/adapter_fireflyfansnet.py +++ b/fanficfare/adapters/adapter_fireflyfansnet.py @@ -21,10 +21,8 @@ from __future__ import absolute_import ''' This adapter will download the stories from the www.fireflyfans.net forum pages ''' import logging import re -import sys # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_forumquestionablequestingcom.py b/fanficfare/adapters/adapter_forumquestionablequestingcom.py index 59c6d534..0f85adf2 100644 --- a/fanficfare/adapters/adapter_forumquestionablequestingcom.py +++ b/fanficfare/adapters/adapter_forumquestionablequestingcom.py @@ -17,7 +17,6 @@ from __future__ import absolute_import import re -from ..htmlcleanup import stripHTML from .base_xenforoforum_adapter import BaseXenForoForumAdapter diff --git a/fanficfare/adapters/adapter_harrypotterfanfictioncom.py b/fanficfare/adapters/adapter_harrypotterfanfictioncom.py index 0df46a1b..21e82795 100644 --- a/fanficfare/adapters/adapter_harrypotterfanfictioncom.py +++ b/fanficfare/adapters/adapter_harrypotterfanfictioncom.py @@ -19,12 +19,10 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -from ..htmlcleanup import stripHTML, removeAllEntities +from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_hentaifoundrycom.py b/fanficfare/adapters/adapter_hentaifoundrycom.py index 597b34ab..df5e1584 100644 --- a/fanficfare/adapters/adapter_hentaifoundrycom.py +++ b/fanficfare/adapters/adapter_hentaifoundrycom.py @@ -23,8 +23,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_hlfictionnet.py b/fanficfare/adapters/adapter_hlfictionnet.py index 0b9b7ae2..e05f2aa6 100644 --- a/fanficfare/adapters/adapter_hlfictionnet.py +++ b/fanficfare/adapters/adapter_hlfictionnet.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_hpfanficarchivecom.py b/fanficfare/adapters/adapter_hpfanficarchivecom.py index cf15f55b..f9e4b654 100644 --- a/fanficfare/adapters/adapter_hpfanficarchivecom.py +++ b/fanficfare/adapters/adapter_hpfanficarchivecom.py @@ -26,7 +26,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_iketernalnet.py b/fanficfare/adapters/adapter_iketernalnet.py index aa854be4..5be15069 100644 --- a/fanficfare/adapters/adapter_iketernalnet.py +++ b/fanficfare/adapters/adapter_iketernalnet.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_imagineeficcom.py b/fanficfare/adapters/adapter_imagineeficcom.py index 5e18737e..a7692c84 100644 --- a/fanficfare/adapters/adapter_imagineeficcom.py +++ b/fanficfare/adapters/adapter_imagineeficcom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_inkbunnynet.py b/fanficfare/adapters/adapter_inkbunnynet.py index 56e98e85..c6af2b6e 100644 --- a/fanficfare/adapters/adapter_inkbunnynet.py +++ b/fanficfare/adapters/adapter_inkbunnynet.py @@ -21,17 +21,12 @@ from __future__ import absolute_import import logging import re -import sys -from datetime import datetime, timedelta # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from .. import exceptions as exceptions from ..htmlcleanup import stripHTML -from ..dateutils import UNIX_EPOCHE logger = logging.getLogger(__name__) diff --git a/fanficfare/adapters/adapter_ksarchivecom.py b/fanficfare/adapters/adapter_ksarchivecom.py index 967b6e1e..61984200 100644 --- a/fanficfare/adapters/adapter_ksarchivecom.py +++ b/fanficfare/adapters/adapter_ksarchivecom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_lcfanficcom.py b/fanficfare/adapters/adapter_lcfanficcom.py index 8ed67230..ba75e0b5 100644 --- a/fanficfare/adapters/adapter_lcfanficcom.py +++ b/fanficfare/adapters/adapter_lcfanficcom.py @@ -20,14 +20,12 @@ from __future__ import absolute_import import logging -import json import re import sys # ## used for debug purposes import datetime # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_literotica.py b/fanficfare/adapters/adapter_literotica.py index 18ab0170..dec77726 100644 --- a/fanficfare/adapters/adapter_literotica.py +++ b/fanficfare/adapters/adapter_literotica.py @@ -27,7 +27,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_lotrgficcom.py b/fanficfare/adapters/adapter_lotrgficcom.py index b6736df0..19cadf97 100644 --- a/fanficfare/adapters/adapter_lotrgficcom.py +++ b/fanficfare/adapters/adapter_lotrgficcom.py @@ -22,13 +22,11 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import urllib from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_lumossycophanthexcom.py b/fanficfare/adapters/adapter_lumossycophanthexcom.py index 166d3125..cb0fae31 100644 --- a/fanficfare/adapters/adapter_lumossycophanthexcom.py +++ b/fanficfare/adapters/adapter_lumossycophanthexcom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_masseffect2in.py b/fanficfare/adapters/adapter_masseffect2in.py index 7b0009e7..5f4700d7 100644 --- a/fanficfare/adapters/adapter_masseffect2in.py +++ b/fanficfare/adapters/adapter_masseffect2in.py @@ -26,7 +26,6 @@ from ..htmlcleanup import removeEntities, stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from ..six.moves import zip as izip from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_mcstoriescom.py b/fanficfare/adapters/adapter_mcstoriescom.py index 535d5769..75128d39 100644 --- a/fanficfare/adapters/adapter_mcstoriescom.py +++ b/fanficfare/adapters/adapter_mcstoriescom.py @@ -22,13 +22,10 @@ import re import os from bs4.element import Comment -from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_mediaminerorg.py b/fanficfare/adapters/adapter_mediaminerorg.py index 5b1ae81d..0f509f5e 100644 --- a/fanficfare/adapters/adapter_mediaminerorg.py +++ b/fanficfare/adapters/adapter_mediaminerorg.py @@ -19,13 +19,11 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import urllib from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_merlinficdtwinscouk.py b/fanficfare/adapters/adapter_merlinficdtwinscouk.py index cf6fea2f..6d8a6432 100644 --- a/fanficfare/adapters/adapter_merlinficdtwinscouk.py +++ b/fanficfare/adapters/adapter_merlinficdtwinscouk.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_midnightwhispers.py b/fanficfare/adapters/adapter_midnightwhispers.py index c8bed825..77fc4b09 100644 --- a/fanficfare/adapters/adapter_midnightwhispers.py +++ b/fanficfare/adapters/adapter_midnightwhispers.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_mttjustoncenet.py b/fanficfare/adapters/adapter_mttjustoncenet.py index e3a1bd86..e6b06f14 100644 --- a/fanficfare/adapters/adapter_mttjustoncenet.py +++ b/fanficfare/adapters/adapter_mttjustoncenet.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -from ..htmlcleanup import stripHTML # Software: eFiction from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_mugglenetfanfictioncom.py b/fanficfare/adapters/adapter_mugglenetfanfictioncom.py index 024c5862..689f81f0 100644 --- a/fanficfare/adapters/adapter_mugglenetfanfictioncom.py +++ b/fanficfare/adapters/adapter_mugglenetfanfictioncom.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -from ..htmlcleanup import stripHTML # Software: eFiction from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_narutoficorg.py b/fanficfare/adapters/adapter_narutoficorg.py index 2d0bbd92..74e162dc 100644 --- a/fanficfare/adapters/adapter_narutoficorg.py +++ b/fanficfare/adapters/adapter_narutoficorg.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -from ..htmlcleanup import stripHTML # Software: eFiction from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_novelonlinefullcom.py b/fanficfare/adapters/adapter_novelonlinefullcom.py index 142f51ee..774f4fbf 100644 --- a/fanficfare/adapters/adapter_novelonlinefullcom.py +++ b/fanficfare/adapters/adapter_novelonlinefullcom.py @@ -23,14 +23,11 @@ from __future__ import absolute_import import logging import re # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from bs4 import Comment -from ..htmlcleanup import removeEntities, stripHTML, fix_excess_space +from ..htmlcleanup import fix_excess_space, stripHTML from .. import exceptions as exceptions logger = logging.getLogger(__name__) diff --git a/fanficfare/adapters/adapter_noveltrovecom.py b/fanficfare/adapters/adapter_noveltrovecom.py index 501960c2..4605ae64 100644 --- a/fanficfare/adapters/adapter_noveltrovecom.py +++ b/fanficfare/adapters/adapter_noveltrovecom.py @@ -20,14 +20,10 @@ from __future__ import absolute_import import logging -import json import re import sys # ## used for debug purposes -import datetime # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_occlumencysycophanthexcom.py b/fanficfare/adapters/adapter_occlumencysycophanthexcom.py index 15186afd..9aa5f79d 100644 --- a/fanficfare/adapters/adapter_occlumencysycophanthexcom.py +++ b/fanficfare/adapters/adapter_occlumencysycophanthexcom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_phoenixsongnet.py b/fanficfare/adapters/adapter_phoenixsongnet.py index 052c1e51..591a5aa3 100644 --- a/fanficfare/adapters/adapter_phoenixsongnet.py +++ b/fanficfare/adapters/adapter_phoenixsongnet.py @@ -24,8 +24,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_ponyfictionarchivenet.py b/fanficfare/adapters/adapter_ponyfictionarchivenet.py index 2ed6c639..b661ac47 100644 --- a/fanficfare/adapters/adapter_ponyfictionarchivenet.py +++ b/fanficfare/adapters/adapter_ponyfictionarchivenet.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_potionsandsnitches.py b/fanficfare/adapters/adapter_potionsandsnitches.py index 5b6b19ce..11fa38a4 100644 --- a/fanficfare/adapters/adapter_potionsandsnitches.py +++ b/fanficfare/adapters/adapter_potionsandsnitches.py @@ -20,13 +20,11 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import urllib from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_potterficscom.py b/fanficfare/adapters/adapter_potterficscom.py index 02f3fe00..e5b03666 100644 --- a/fanficfare/adapters/adapter_potterficscom.py +++ b/fanficfare/adapters/adapter_potterficscom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter diff --git a/fanficfare/adapters/adapter_potterheadsanonymouscom.py b/fanficfare/adapters/adapter_potterheadsanonymouscom.py index 7b2913a8..44c60ea4 100644 --- a/fanficfare/adapters/adapter_potterheadsanonymouscom.py +++ b/fanficfare/adapters/adapter_potterheadsanonymouscom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_pretendercentrecom.py b/fanficfare/adapters/adapter_pretendercentrecom.py index ed1ad730..4f1b557b 100644 --- a/fanficfare/adapters/adapter_pretendercentrecom.py +++ b/fanficfare/adapters/adapter_pretendercentrecom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_qafficcom.py b/fanficfare/adapters/adapter_qafficcom.py index cbdb408e..fc66067c 100644 --- a/fanficfare/adapters/adapter_qafficcom.py +++ b/fanficfare/adapters/adapter_qafficcom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_quotevcom.py b/fanficfare/adapters/adapter_quotevcom.py index 7019c59c..7d8fab9e 100644 --- a/fanficfare/adapters/adapter_quotevcom.py +++ b/fanficfare/adapters/adapter_quotevcom.py @@ -25,7 +25,6 @@ from .. import exceptions # py2 vs py3 transition from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter from ..htmlcleanup import stripHTML diff --git a/fanficfare/adapters/adapter_royalroadcom.py b/fanficfare/adapters/adapter_royalroadcom.py index b003f715..62805a2b 100644 --- a/fanficfare/adapters/adapter_royalroadcom.py +++ b/fanficfare/adapters/adapter_royalroadcom.py @@ -25,9 +25,7 @@ from ..dateutils import parse_relative_date_string from ..htmlcleanup import stripHTML # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves import http_client as httplib -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter diff --git a/fanficfare/adapters/adapter_samandjacknet.py b/fanficfare/adapters/adapter_samandjacknet.py index bc0a20b0..fed604f3 100644 --- a/fanficfare/adapters/adapter_samandjacknet.py +++ b/fanficfare/adapters/adapter_samandjacknet.py @@ -23,8 +23,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_scarvesandcoffeenet.py b/fanficfare/adapters/adapter_scarvesandcoffeenet.py index 3cbfb205..bb19ef4c 100644 --- a/fanficfare/adapters/adapter_scarvesandcoffeenet.py +++ b/fanficfare/adapters/adapter_scarvesandcoffeenet.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_scifistoriescom.py b/fanficfare/adapters/adapter_scifistoriescom.py index 1525c6b5..30824f6f 100644 --- a/fanficfare/adapters/adapter_scifistoriescom.py +++ b/fanficfare/adapters/adapter_scifistoriescom.py @@ -20,7 +20,6 @@ import logging logger = logging.getLogger(__name__) # py2 vs py3 transition -from ..six import text_type as unicode from .adapter_finestoriescom import FineStoriesComAdapter diff --git a/fanficfare/adapters/adapter_scribblehubcom.py b/fanficfare/adapters/adapter_scribblehubcom.py index 1c262386..7293ebd7 100644 --- a/fanficfare/adapters/adapter_scribblehubcom.py +++ b/fanficfare/adapters/adapter_scribblehubcom.py @@ -23,7 +23,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves import http_cookiejar as cl diff --git a/fanficfare/adapters/adapter_sheppardweircom.py b/fanficfare/adapters/adapter_sheppardweircom.py index e4fe940f..7fc2304e 100644 --- a/fanficfare/adapters/adapter_sheppardweircom.py +++ b/fanficfare/adapters/adapter_sheppardweircom.py @@ -24,7 +24,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_shriftweborgbfa.py b/fanficfare/adapters/adapter_shriftweborgbfa.py index 1378c02c..3cf939e9 100644 --- a/fanficfare/adapters/adapter_shriftweborgbfa.py +++ b/fanficfare/adapters/adapter_shriftweborgbfa.py @@ -25,11 +25,8 @@ from __future__ import absolute_import ''' This adapter scrapes the metadata and chapter text from stories on archive.shriftweb.org ''' import logging import re -import sys # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate @@ -153,7 +150,6 @@ class BFAArchiveShriftwebOrgSiteAdapter(BaseSiteAdapter): )+'/cgi-bin/search.cgi?Author={}&SortBy=0'+ '&SortOrder=0&NumToList=0&FastSearch=0' + '&ShortResults=0').format(author_name) - pass else: stories_main = u'' + repr(stories_main).split('',1)[1][:-5] ## now that I have the stories in a format that I can manipulate, I'm going to diff --git a/fanficfare/adapters/adapter_silmarillionwritersguildorg.py b/fanficfare/adapters/adapter_silmarillionwritersguildorg.py index 8f1eeb37..66c6d440 100644 --- a/fanficfare/adapters/adapter_silmarillionwritersguildorg.py +++ b/fanficfare/adapters/adapter_silmarillionwritersguildorg.py @@ -20,12 +20,10 @@ import logging logger = logging.getLogger(__name__) import re from bs4.element import Tag -from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate @@ -154,7 +152,6 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): pass except Exception as e: logger.warning("series parsing failed(%s)"%e) - pass # Find the chapters by regexing urls chapters=soup.findAll('a', href=re.compile(r'viewstory.php\?sid='+self.story.getMetadata('storyId')+r"&chapter=\d+$")) diff --git a/fanficfare/adapters/adapter_siyecouk.py b/fanficfare/adapters/adapter_siyecouk.py index 13d30b49..da7bc2db 100644 --- a/fanficfare/adapters/adapter_siyecouk.py +++ b/fanficfare/adapters/adapter_siyecouk.py @@ -24,8 +24,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_spikeluvercom.py b/fanficfare/adapters/adapter_spikeluvercom.py index 3a6b73be..98a82386 100644 --- a/fanficfare/adapters/adapter_spikeluvercom.py +++ b/fanficfare/adapters/adapter_spikeluvercom.py @@ -6,9 +6,7 @@ from bs4.element import Tag from ..htmlcleanup import stripHTML # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from .. import exceptions diff --git a/fanficfare/adapters/adapter_squidgeorgpeja.py b/fanficfare/adapters/adapter_squidgeorgpeja.py index 18688f68..3b378013 100644 --- a/fanficfare/adapters/adapter_squidgeorgpeja.py +++ b/fanficfare/adapters/adapter_squidgeorgpeja.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_starskyhutcharchivenet.py b/fanficfare/adapters/adapter_starskyhutcharchivenet.py index 9c4df433..004d81f0 100644 --- a/fanficfare/adapters/adapter_starskyhutcharchivenet.py +++ b/fanficfare/adapters/adapter_starskyhutcharchivenet.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -from ..htmlcleanup import stripHTML # Software: eFiction from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_starslibrarynet.py b/fanficfare/adapters/adapter_starslibrarynet.py index 3c6c0eba..7c8c5f65 100644 --- a/fanficfare/adapters/adapter_starslibrarynet.py +++ b/fanficfare/adapters/adapter_starslibrarynet.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -from ..htmlcleanup import stripHTML # Software: eFiction from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_storiesofardacom.py b/fanficfare/adapters/adapter_storiesofardacom.py index 99767cc2..bc41ea2f 100644 --- a/fanficfare/adapters/adapter_storiesofardacom.py +++ b/fanficfare/adapters/adapter_storiesofardacom.py @@ -23,8 +23,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_storiesonlinenet.py b/fanficfare/adapters/adapter_storiesonlinenet.py index 1df76184..2fc5c61b 100644 --- a/fanficfare/adapters/adapter_storiesonlinenet.py +++ b/fanficfare/adapters/adapter_storiesonlinenet.py @@ -383,7 +383,6 @@ class StoriesOnlineNetAdapter(BaseSiteAdapter): # logger.debug("No universe page") except: raise - pass try: a = description_element.find('a', href=re.compile(r"/universe/\d+/.*")) # logger.debug("Looking for universe - a='{0}'".format(a)) @@ -416,7 +415,6 @@ class StoriesOnlineNetAdapter(BaseSiteAdapter): # logger.debug("Do not have a universe") except: raise - pass # There's nothing around the desc to grab it by, and there's a # variable number of links before it. diff --git a/fanficfare/adapters/adapter_sugarquillnet.py b/fanficfare/adapters/adapter_sugarquillnet.py index 700bbb78..fc1956fc 100644 --- a/fanficfare/adapters/adapter_sugarquillnet.py +++ b/fanficfare/adapters/adapter_sugarquillnet.py @@ -30,15 +30,12 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import sys from bs4.element import Comment from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_swiorgru.py b/fanficfare/adapters/adapter_swiorgru.py index 792bbd26..2f8251b1 100644 --- a/fanficfare/adapters/adapter_swiorgru.py +++ b/fanficfare/adapters/adapter_swiorgru.py @@ -1,19 +1,15 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import -import datetime import logging logger = logging.getLogger(__name__) -import re, sys -from .. import translit +import re from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_swordborderlineangelcom.py b/fanficfare/adapters/adapter_swordborderlineangelcom.py index 3b2cfd09..bea5bc12 100644 --- a/fanficfare/adapters/adapter_swordborderlineangelcom.py +++ b/fanficfare/adapters/adapter_swordborderlineangelcom.py @@ -17,7 +17,6 @@ # Software: eFiction from __future__ import absolute_import -from ..htmlcleanup import stripHTML from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_tasteofpoisoninkubationnet.py b/fanficfare/adapters/adapter_tasteofpoisoninkubationnet.py index 3ad19ac4..90b19f58 100644 --- a/fanficfare/adapters/adapter_tasteofpoisoninkubationnet.py +++ b/fanficfare/adapters/adapter_tasteofpoisoninkubationnet.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -from ..htmlcleanup import stripHTML # Software: eFiction from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_tenhawkpresents.py b/fanficfare/adapters/adapter_tenhawkpresents.py index fce36d86..d4bd1ef2 100644 --- a/fanficfare/adapters/adapter_tenhawkpresents.py +++ b/fanficfare/adapters/adapter_tenhawkpresents.py @@ -20,13 +20,11 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import urllib from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_thedelphicexpansecom.py b/fanficfare/adapters/adapter_thedelphicexpansecom.py index c634cbb5..a6f27525 100644 --- a/fanficfare/adapters/adapter_thedelphicexpansecom.py +++ b/fanficfare/adapters/adapter_thedelphicexpansecom.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -from ..htmlcleanup import stripHTML # Software: eFiction from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_themasquenet.py b/fanficfare/adapters/adapter_themasquenet.py index efb8db70..1306b2b1 100644 --- a/fanficfare/adapters/adapter_themasquenet.py +++ b/fanficfare/adapters/adapter_themasquenet.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_thepetulantpoetesscom.py b/fanficfare/adapters/adapter_thepetulantpoetesscom.py index 9aa31b32..5081c93e 100644 --- a/fanficfare/adapters/adapter_thepetulantpoetesscom.py +++ b/fanficfare/adapters/adapter_thepetulantpoetesscom.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_thesietchcom.py b/fanficfare/adapters/adapter_thesietchcom.py index 80bc6f0f..3502d126 100644 --- a/fanficfare/adapters/adapter_thesietchcom.py +++ b/fanficfare/adapters/adapter_thesietchcom.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -import re # py2 vs py3 transition from ..six import text_type as unicode diff --git a/fanficfare/adapters/adapter_thundercatsfansorg.py b/fanficfare/adapters/adapter_thundercatsfansorg.py index 534fdddd..9dda0698 100644 --- a/fanficfare/adapters/adapter_thundercatsfansorg.py +++ b/fanficfare/adapters/adapter_thundercatsfansorg.py @@ -16,7 +16,6 @@ # from __future__ import absolute_import -from ..htmlcleanup import stripHTML # Software: eFiction from .base_efiction_adapter import BaseEfictionAdapter diff --git a/fanficfare/adapters/adapter_tomparisdormcom.py b/fanficfare/adapters/adapter_tomparisdormcom.py index f5b5b895..1bf1d874 100644 --- a/fanficfare/adapters/adapter_tomparisdormcom.py +++ b/fanficfare/adapters/adapter_tomparisdormcom.py @@ -20,15 +20,12 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import sys -from bs4.element import Comment from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_trekfanfictionnet.py b/fanficfare/adapters/adapter_trekfanfictionnet.py index 52e92e58..1ed321c8 100644 --- a/fanficfare/adapters/adapter_trekfanfictionnet.py +++ b/fanficfare/adapters/adapter_trekfanfictionnet.py @@ -29,8 +29,6 @@ This will scrape the chapter text and metadata from stories on the site trekfanf import logging import re # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_trekiverseorg.py b/fanficfare/adapters/adapter_trekiverseorg.py index 84bdfc0b..d8820952 100644 --- a/fanficfare/adapters/adapter_trekiverseorg.py +++ b/fanficfare/adapters/adapter_trekiverseorg.py @@ -19,12 +19,10 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_tthfanficorg.py b/fanficfare/adapters/adapter_tthfanficorg.py index ea77669c..8d71ce87 100644 --- a/fanficfare/adapters/adapter_tthfanficorg.py +++ b/fanficfare/adapters/adapter_tthfanficorg.py @@ -23,8 +23,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_twilightednet.py b/fanficfare/adapters/adapter_twilightednet.py index 611e7a1e..93a6c00c 100644 --- a/fanficfare/adapters/adapter_twilightednet.py +++ b/fanficfare/adapters/adapter_twilightednet.py @@ -20,13 +20,11 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -import urllib from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_voracity2eficcom.py b/fanficfare/adapters/adapter_voracity2eficcom.py index 9adc8e40..2a3b98db 100644 --- a/fanficfare/adapters/adapter_voracity2eficcom.py +++ b/fanficfare/adapters/adapter_voracity2eficcom.py @@ -5,7 +5,6 @@ import re from bs4.element import Tag # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse from ..six.moves.urllib.error import HTTPError diff --git a/fanficfare/adapters/adapter_walkingtheplankorg.py b/fanficfare/adapters/adapter_walkingtheplankorg.py index 3fca456f..a37a2052 100644 --- a/fanficfare/adapters/adapter_walkingtheplankorg.py +++ b/fanficfare/adapters/adapter_walkingtheplankorg.py @@ -25,7 +25,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_webnovelcom.py b/fanficfare/adapters/adapter_webnovelcom.py index 8b962227..219ec932 100644 --- a/fanficfare/adapters/adapter_webnovelcom.py +++ b/fanficfare/adapters/adapter_webnovelcom.py @@ -30,7 +30,6 @@ import re import time # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter from .. import exceptions as exceptions diff --git a/fanficfare/adapters/adapter_whoficcom.py b/fanficfare/adapters/adapter_whoficcom.py index 826055a5..7a3fd447 100644 --- a/fanficfare/adapters/adapter_whoficcom.py +++ b/fanficfare/adapters/adapter_whoficcom.py @@ -24,8 +24,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_wolverineandroguecom.py b/fanficfare/adapters/adapter_wolverineandroguecom.py index d4a494ab..20574dfe 100644 --- a/fanficfare/adapters/adapter_wolverineandroguecom.py +++ b/fanficfare/adapters/adapter_wolverineandroguecom.py @@ -24,7 +24,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_wraithbaitcom.py b/fanficfare/adapters/adapter_wraithbaitcom.py index 9b85c08f..5b390037 100644 --- a/fanficfare/adapters/adapter_wraithbaitcom.py +++ b/fanficfare/adapters/adapter_wraithbaitcom.py @@ -23,8 +23,6 @@ from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_wuxiaworldco.py b/fanficfare/adapters/adapter_wuxiaworldco.py index 7813fb8b..19532b12 100644 --- a/fanficfare/adapters/adapter_wuxiaworldco.py +++ b/fanficfare/adapters/adapter_wuxiaworldco.py @@ -20,9 +20,7 @@ from __future__ import absolute_import import logging import re # py2 vs py3 transition -from ..six import text_type as unicode, ensure_text from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from fanficfare.htmlcleanup import stripHTML diff --git a/fanficfare/adapters/adapter_wuxiaworldcom.py b/fanficfare/adapters/adapter_wuxiaworldcom.py index 8cab6ced..53edf274 100644 --- a/fanficfare/adapters/adapter_wuxiaworldcom.py +++ b/fanficfare/adapters/adapter_wuxiaworldcom.py @@ -21,9 +21,7 @@ import json import logging import re # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from ..htmlcleanup import stripHTML diff --git a/fanficfare/adapters/adapter_wuxiaworldsite.py b/fanficfare/adapters/adapter_wuxiaworldsite.py index 46f230b6..16c06d31 100644 --- a/fanficfare/adapters/adapter_wuxiaworldsite.py +++ b/fanficfare/adapters/adapter_wuxiaworldsite.py @@ -21,9 +21,7 @@ import json import logging import re # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from ..dateutils import parse_relative_date_string from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/adapter_wwwaneroticstorycom.py b/fanficfare/adapters/adapter_wwwaneroticstorycom.py index f7a83e31..3a2cbc0f 100644 --- a/fanficfare/adapters/adapter_wwwaneroticstorycom.py +++ b/fanficfare/adapters/adapter_wwwaneroticstorycom.py @@ -18,19 +18,13 @@ from __future__ import absolute_import import logging import os -import re -import sys from bs4.element import Comment # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from .. import exceptions as exceptions -from ..htmlcleanup import stripHTML logger = logging.getLogger(__name__) diff --git a/fanficfare/adapters/adapter_wwwlushstoriescom.py b/fanficfare/adapters/adapter_wwwlushstoriescom.py index 6ba1ed2f..0622dc95 100644 --- a/fanficfare/adapters/adapter_wwwlushstoriescom.py +++ b/fanficfare/adapters/adapter_wwwlushstoriescom.py @@ -23,14 +23,11 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) -import re from ..htmlcleanup import stripHTML from .. import exceptions as exceptions -from bs4 import Comment, BeautifulSoup # py2 vs py3 transition -from ..six import text_type as unicode from ..six.moves.urllib.error import HTTPError from ..six.moves.urllib.parse import quote diff --git a/fanficfare/adapters/adapter_wwwnovelallcom.py b/fanficfare/adapters/adapter_wwwnovelallcom.py index 4c049b4a..e032e0a5 100644 --- a/fanficfare/adapters/adapter_wwwnovelallcom.py +++ b/fanficfare/adapters/adapter_wwwnovelallcom.py @@ -24,14 +24,11 @@ import logging import re import json # py2 vs py3 transition -from ..six import text_type as unicode -from ..six.moves.urllib import parse as urlparse -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate from bs4 import Comment -from ..htmlcleanup import removeEntities, stripHTML, fix_excess_space +from ..htmlcleanup import fix_excess_space from .. import exceptions as exceptions from ..dateutils import parse_relative_date_string diff --git a/fanficfare/adapters/adapter_wwwutopiastoriescom.py b/fanficfare/adapters/adapter_wwwutopiastoriescom.py index ff434ddf..c3a4171c 100644 --- a/fanficfare/adapters/adapter_wwwutopiastoriescom.py +++ b/fanficfare/adapters/adapter_wwwutopiastoriescom.py @@ -32,7 +32,6 @@ We get the category from the author's page import logging logger = logging.getLogger(__name__) import re -import sys from bs4.element import Comment @@ -41,7 +40,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from ..six.moves.urllib.parse import quote from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/base_adapter.py b/fanficfare/adapters/base_adapter.py index 178a7679..ae38077f 100644 --- a/fanficfare/adapters/base_adapter.py +++ b/fanficfare/adapters/base_adapter.py @@ -409,7 +409,6 @@ class BaseSiteAdapter(Requestable): def extractChapterUrlsAndMetadata(self): "Needs to be overriden in each adapter class. Populates self.story metadata" - pass def getChapterTextNum(self, url, index): "For adapters that also want to know the chapter index number." @@ -417,7 +416,6 @@ class BaseSiteAdapter(Requestable): def getChapterText(self, url): "Needs to be overriden in each adapter class." - pass def before_get_urls_from_page(self,url,normalize): ## some sites need a login or other prep for 'from page' to diff --git a/fanficfare/adapters/base_efiction_adapter.py b/fanficfare/adapters/base_efiction_adapter.py index fdc2e94b..ea63eb2b 100644 --- a/fanficfare/adapters/base_efiction_adapter.py +++ b/fanficfare/adapters/base_efiction_adapter.py @@ -28,7 +28,6 @@ from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError from .base_adapter import BaseSiteAdapter, makeDate diff --git a/fanficfare/adapters/base_xenforo2forum_adapter.py b/fanficfare/adapters/base_xenforo2forum_adapter.py index cbe1b3e3..64f698d4 100644 --- a/fanficfare/adapters/base_xenforo2forum_adapter.py +++ b/fanficfare/adapters/base_xenforo2forum_adapter.py @@ -20,16 +20,13 @@ import logging from datetime import datetime logger = logging.getLogger(__name__) import re -from xml.dom.minidom import parseString from ..htmlcleanup import stripHTML from .. import exceptions as exceptions # py2 vs py3 transition from ..six import text_type as unicode -from ..six.moves.urllib.error import HTTPError -from .base_adapter import makeDate from .base_xenforoforum_adapter import BaseXenForoForumAdapter logger = logging.getLogger(__name__) diff --git a/fanficfare/adapters/base_xenforoforum_adapter.py b/fanficfare/adapters/base_xenforoforum_adapter.py index e7630c68..81801e50 100644 --- a/fanficfare/adapters/base_xenforoforum_adapter.py +++ b/fanficfare/adapters/base_xenforoforum_adapter.py @@ -19,7 +19,6 @@ from __future__ import absolute_import import logging logger = logging.getLogger(__name__) import re -from xml.dom.minidom import parseString from ..htmlcleanup import stripHTML from .. import exceptions as exceptions