PI: imports from calibre_plugins.fanficfare_plugin.fanficfare not .fanficfare.

This commit is contained in:
Jim Miller 2021-04-13 21:58:38 -05:00
parent 1bfa1bc62b
commit 8e9a734299
9 changed files with 11 additions and 11 deletions

View file

@ -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):
'''

View file

@ -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

View file

@ -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

View file

@ -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:

View file

@ -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

View file

@ -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']

View file

@ -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):
'''

View file

@ -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)

View file

@ -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'<body[^>]*>(.*)</body>', re.UNICODE | re.DOTALL | re.IGNORECASE)
RE_STRIP_MARKUP = re.compile(u'<[^>]+>', re.UNICODE)