Tweaks to imports for calibre plugin.

This commit is contained in:
Jim Miller 2018-07-31 13:01:35 -05:00
parent 308f9ffe6b
commit 0870e2056f
2 changed files with 6 additions and 1 deletions

View file

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

View file

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