From 33754b8d1e863a9cb1b9d04baee5923fc7fe155f Mon Sep 17 00:00:00 2001 From: echel0n Date: Tue, 22 Apr 2014 07:52:26 -0700 Subject: [PATCH] Fix for guessit importing --- lib/guessit/__init__.py | 12 ++++++------ lib/guessit/transfo/__init__.py | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/guessit/__init__.py b/lib/guessit/__init__.py index e6cfa276..beae7565 100644 --- a/lib/guessit/__init__.py +++ b/lib/guessit/__init__.py @@ -71,10 +71,10 @@ else: return x.encode('hex') -from guessit.guess import Guess, merge_all -from guessit.language import Language -from guessit.matcher import IterativeMatcher -from guessit.textutils import clean_string +from lib.guessit.guess import Guess, merge_all +from lib.guessit.language import Language +from lib.guessit.matcher import IterativeMatcher +from lib.guessit.textutils import clean_string import logging import json @@ -219,7 +219,7 @@ def guess_file_info(filename, filetype, info=None): result.append(_guess_filename(filename, filetype)) elif infotype == 'hash_mpc': - from guessit.hash_mpc import hash_file + from lib.guessit.hash_mpc import hash_file try: result.append(Guess({'hash_mpc': hash_file(filename)}, confidence=1.0)) @@ -227,7 +227,7 @@ def guess_file_info(filename, filetype, info=None): log.warning('Could not compute MPC-style hash because: %s' % e) elif infotype == 'hash_ed2k': - from guessit.hash_ed2k import hash_file + from lib.guessit.hash_ed2k import hash_file try: result.append(Guess({'hash_ed2k': hash_file(filename)}, confidence=1.0)) diff --git a/lib/guessit/transfo/__init__.py b/lib/guessit/transfo/__init__.py index a28aa988..d5180b70 100644 --- a/lib/guessit/transfo/__init__.py +++ b/lib/guessit/transfo/__init__.py @@ -19,9 +19,9 @@ # from __future__ import unicode_literals -from guessit import base_text_type, Guess -from guessit.patterns import canonical_form -from guessit.textutils import clean_string +from lib.guessit import base_text_type, Guess +from lib.guessit.patterns import canonical_form +from lib.guessit.textutils import clean_string import logging log = logging.getLogger(__name__)