diff --git a/calibre-plugin/config.py b/calibre-plugin/config.py index d53415f6..a3ae4504 100644 --- a/calibre-plugin/config.py +++ b/calibre-plugin/config.py @@ -18,13 +18,13 @@ from collections import OrderedDict try: from PyQt5 import QtWidgets as QtGui from PyQt5.Qt import (QWidget, QVBoxLayout, QHBoxLayout, QGridLayout, QLabel, - QLineEdit, QWidget, QComboBox, QCheckBox, QPushButton, QTabWidget, + QLineEdit, QComboBox, QCheckBox, QPushButton, QTabWidget, QScrollArea, QGroupBox, QButtonGroup, QRadioButton, Qt) except ImportError as e: from PyQt4 import QtGui from PyQt4.Qt import (QWidget, QVBoxLayout, QHBoxLayout, QGridLayout, QLabel, - QLineEdit, QWidget, QComboBox, QCheckBox, QPushButton, QTabWidget, + QLineEdit, QComboBox, QCheckBox, QPushButton, QTabWidget, QScrollArea, QGroupBox, QButtonGroup, QRadioButton, Qt) try: diff --git a/fanficfare/adapters/base_adapter.py b/fanficfare/adapters/base_adapter.py index 89cff001..cf693cf7 100644 --- a/fanficfare/adapters/base_adapter.py +++ b/fanficfare/adapters/base_adapter.py @@ -33,7 +33,6 @@ import copy from bs4 import BeautifulSoup, Tag -from ..htmlcleanup import stripHTML from ..htmlheuristics import replace_br_with_p logger = logging.getLogger(__name__) diff --git a/fanficfare/browsercache/basebrowsercache.py b/fanficfare/browsercache/basebrowsercache.py index 312ba4ed..5550f06e 100644 --- a/fanficfare/browsercache/basebrowsercache.py +++ b/fanficfare/browsercache/basebrowsercache.py @@ -59,8 +59,6 @@ def do_cprofile(func): class BrowserCacheException(Exception): pass -from ..six import ensure_binary, ensure_text - ## difference in seconds between Jan 1 1601 and Jan 1 1970. Chrome ## caches (so far) have kept time stamps as microseconds since ## 1-1-1601 a Windows/Cobol thing. diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py index d8099215..f229f35d 100644 --- a/fanficfare/configurable.py +++ b/fanficfare/configurable.py @@ -67,7 +67,6 @@ from .browsercache import BrowserCache try: from . import adapters except ImportError: - import sys if "fanficfare.adapters" in sys.modules: adapters = sys.modules["fanficfare.adapters"] elif "calibre_plugins.fanficfare_plugin.fanficfare.adapters" in sys.modules: @@ -288,7 +287,6 @@ def get_valid_set_options(): 'dedup_order_chapter_list': (['wuxiaworld.co', 'novelupdates.cc'], None, boollist), 'show_nsfw_cover_images': (['fiction.live'], None, boollist), 'show_timestamps': (['fiction.live'], None, boollist), - 'show_nsfw_cover_images': (['fiction.live'], None, boollist) } return dict(valdict)