From 0870e2056f6492962add994f076f4239701c5ab0 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Tue, 31 Jul 2018 13:01:35 -0500 Subject: [PATCH] Tweaks to imports for calibre plugin. --- fanficfare/adapters/__init__.py | 1 + fanficfare/configurable.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fanficfare/adapters/__init__.py b/fanficfare/adapters/__init__.py index ceacd2e0..8d90d247 100644 --- a/fanficfare/adapters/__init__.py +++ b/fanficfare/adapters/__init__.py @@ -24,6 +24,7 @@ from six.moves.urllib.parse import urlparse logger = logging.getLogger(__name__) from .. import exceptions as exceptions +from .. import configurable as configurable ## must import each adapter here. diff --git a/fanficfare/configurable.py b/fanficfare/configurable.py index 0770617a..2c24b89f 100644 --- a/fanficfare/configurable.py +++ b/fanficfare/configurable.py @@ -15,6 +15,7 @@ # limitations under the License. # +from __future__ import absolute_import import re import exceptions import codecs @@ -81,7 +82,10 @@ try: from . import adapters except ImportError: import sys - adapters = sys.modules["fanficfare.adapters"] + if "fanficfare.adapters" in sys.modules: + adapters = sys.modules["fanficfare.adapters"] + elif "calibre_plugins.fanficfare_plugin.fanficfare.adapters" in sys.modules: + adapters = sys.modules["calibre_plugins.fanficfare_plugin.fanficfare.adapters"] def re_compile(regex,line): try: