diff --git a/calibre-plugin/__init__.py b/calibre-plugin/__init__.py index f2666772..3ec6a61c 100644 --- a/calibre-plugin/__init__.py +++ b/calibre-plugin/__init__.py @@ -33,7 +33,7 @@ except NameError: from calibre.customize import InterfaceActionBase # pulled out from FanFicFareBase for saving in prefs.py -__version__ = (4, 1, 5) +__version__ = (4, 1, 6) ## Apparently the name for this class doesn't matter--it was still ## 'demo' for the first few versions. diff --git a/calibre-plugin/basicinihighlighter.py b/calibre-plugin/basicinihighlighter.py index 82c52a10..21bb18b1 100644 --- a/calibre-plugin/basicinihighlighter.py +++ b/calibre-plugin/basicinihighlighter.py @@ -14,7 +14,7 @@ try: except ImportError as e: from PyQt4.Qt import (Qt, QSyntaxHighlighter, QTextCharFormat, QBrush) -from .fanficfare.six import string_types +from calibre_plugins.fanficfare_plugin.fanficfare.six import string_types class BasicIniHighlighter(QSyntaxHighlighter): ''' diff --git a/calibre-plugin/common_utils.py b/calibre-plugin/common_utils.py index e5d2d59e..072fa8ee 100644 --- a/calibre-plugin/common_utils.py +++ b/calibre-plugin/common_utils.py @@ -29,7 +29,7 @@ from calibre.gui2.actions import menu_action_unique_name from calibre.gui2.keyboard import ShortcutConfig from calibre.utils.config import config_dir from calibre.utils.date import now, format_date, qt_to_dt, UNDEFINED_DATE -from .fanficfare.six import text_type as unicode +from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode # Global definition of our plugin name. Used for common functions that require this. plugin_name = None diff --git a/calibre-plugin/config.py b/calibre-plugin/config.py index a3ae4504..0fe8321f 100644 --- a/calibre-plugin/config.py +++ b/calibre-plugin/config.py @@ -45,7 +45,7 @@ else: from calibre.gui2 import dynamic, info_dialog from calibre.gui2.complete2 import EditWithComplete -from .fanficfare.six import text_type as unicode +from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode try: from calibre.ebooks.covers import generate_cover as cal_generate_cover diff --git a/calibre-plugin/dialogs.py b/calibre-plugin/dialogs.py index 233cd688..e0b256b6 100644 --- a/calibre-plugin/dialogs.py +++ b/calibre-plugin/dialogs.py @@ -53,7 +53,7 @@ from calibre.gui2 import gprefs show_download_options = 'fff:add new/update dialogs:show_download_options' from calibre.gui2.dialogs.confirm_delete import confirm from calibre.gui2.complete2 import EditWithComplete -from .fanficfare.six import text_type as unicode, ensure_text +from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode, ensure_text # pulls in translation files for _() strings try: diff --git a/calibre-plugin/fff_plugin.py b/calibre-plugin/fff_plugin.py index 5c9f9300..d531ec79 100644 --- a/calibre-plugin/fff_plugin.py +++ b/calibre-plugin/fff_plugin.py @@ -9,7 +9,7 @@ __license__ = 'GPL v3' __copyright__ = '2021, Jim Miller' __docformat__ = 'restructuredtext en' -from .fanficfare.six import ensure_text, string_types, text_type as unicode +from calibre_plugins.fanficfare_plugin.fanficfare.six import ensure_text, string_types, text_type as unicode # import cProfile diff --git a/calibre-plugin/fff_util.py b/calibre-plugin/fff_util.py index 04d5cb58..02791ad0 100644 --- a/calibre-plugin/fff_util.py +++ b/calibre-plugin/fff_util.py @@ -18,8 +18,8 @@ logger = logging.getLogger(__name__) from calibre_plugins.fanficfare_plugin.fanficfare import adapters from calibre_plugins.fanficfare_plugin.fanficfare.configurable import Configuration from calibre_plugins.fanficfare_plugin.prefs import prefs -from .fanficfare.six import ensure_text -from .fanficfare.six.moves import configparser +from calibre_plugins.fanficfare_plugin.fanficfare.six import ensure_text +from calibre_plugins.fanficfare_plugin.fanficfare.six.moves import configparser def get_fff_personalini(): return prefs['personal.ini'] diff --git a/calibre-plugin/inihighlighter.py b/calibre-plugin/inihighlighter.py index d00e21a6..ecb25ab1 100644 --- a/calibre-plugin/inihighlighter.py +++ b/calibre-plugin/inihighlighter.py @@ -17,7 +17,7 @@ try: except ImportError as e: from PyQt4.Qt import (QApplication, Qt, QColor, QSyntaxHighlighter, QTextCharFormat, QBrush, QFont) -from .fanficfare.six import string_types +from calibre_plugins.fanficfare_plugin.fanficfare.six import string_types class IniHighlighter(QSyntaxHighlighter): ''' diff --git a/calibre-plugin/jobs.py b/calibre-plugin/jobs.py index 617ab009..e33c1301 100644 --- a/calibre-plugin/jobs.py +++ b/calibre-plugin/jobs.py @@ -20,8 +20,8 @@ from calibre.utils.ipc.server import Server from calibre.utils.ipc.job import ParallelJob from calibre.constants import numeric_version as calibre_version from calibre.utils.date import local_tz -from .fanficfare.six import text_type as unicode -from .fanficfare.six.moves.queue import Empty +from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode +from calibre_plugins.fanficfare_plugin.fanficfare.six.moves.queue import Empty from calibre_plugins.fanficfare_plugin.wordcount import get_word_count from calibre_plugins.fanficfare_plugin.prefs import (SAVE_YES, SAVE_YES_UNLESS_SITE) diff --git a/calibre-plugin/wordcount.py b/calibre-plugin/wordcount.py index acd64f6a..660d9bc3 100644 --- a/calibre-plugin/wordcount.py +++ b/calibre-plugin/wordcount.py @@ -18,7 +18,7 @@ logger = logging.getLogger(__name__) import re from calibre.ebooks.oeb.iterator import EbookIterator -from .fanficfare.six import text_type as unicode +from calibre_plugins.fanficfare_plugin.fanficfare.six import text_type as unicode RE_HTML_BODY = re.compile(u']*>(.*)', re.UNICODE | re.DOTALL | re.IGNORECASE) RE_STRIP_MARKUP = re.compile(u'<[^>]+>', re.UNICODE) diff --git a/fanficfare/cli.py b/fanficfare/cli.py index cd9088ee..c0e37ddf 100644 --- a/fanficfare/cli.py +++ b/fanficfare/cli.py @@ -27,7 +27,7 @@ import pprint import string import os, sys -version="4.1.5" +version="4.1.6" os.environ['CURRENT_VERSION_ID']=version global_cache = 'global_cache' diff --git a/included_dependencies/cloudscraper/__init__.py b/included_dependencies/cloudscraper/__init__.py index 6da11d97..a3debd24 100644 --- a/included_dependencies/cloudscraper/__init__.py +++ b/included_dependencies/cloudscraper/__init__.py @@ -58,7 +58,7 @@ from .user_agent import User_Agent # ------------------------------------------------------------------------------- # -__version__ = '1.2.56py2' +__version__ = '1.2.58py2' # ------------------------------------------------------------------------------- # @@ -197,7 +197,7 @@ class CloudScraper(Session): @staticmethod def debugRequest(req): try: - print(dump.dump_all(req).decode('utf-8')) + print(dump.dump_all(req).decode('utf-8', errors='backslashreplace')) except ValueError as e: print("Debug Error: {}".format(getattr(e, 'message', e))) @@ -355,7 +355,7 @@ class CloudScraper(Session): resp.headers.get('Server', '').startswith('cloudflare') and resp.status_code in [429, 503] and re.search( - r'cpo.src\s*=\s*"/cdn-cgi/challenge-platform/\S+orchestrate/jsch/v1"', + r'cpo.src\s*=\s*"/cdn-cgi/challenge-platform/\S+orchestrate/jsch/v1', resp.text, re.M | re.S ) @@ -376,7 +376,7 @@ class CloudScraper(Session): return ( CloudScraper.is_Captcha_Challenge(resp) and re.search( - r'cpo.src\s*=\s*"/cdn-cgi/challenge-platform/\S+orchestrate/captcha/v1"', + r'cpo.src\s*=\s*"/cdn-cgi/challenge-platform/\S+orchestrate/captcha/v1', resp.text, re.M | re.S ) diff --git a/setup.py b/setup.py index 35ec21e0..a63fff88 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ setup( name=package_name, # Versions should comply with PEP440. - version="4.1.5", + version="4.1.6", description='A tool for downloading fanfiction to eBook formats', long_description=long_description,