diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index 6988806c..e8731c31 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -20,6 +20,8 @@ CONFIG_TV_FILE = os.path.join(PROGRAM_DIR, 'autoProcessTv.cfg') # add our custom libs to the system path sys.path.insert(0, LIBS_DIR) +import requests +import guessit from nzbtomedia.autoProcess.autoProcessComics import autoProcessComics from nzbtomedia.autoProcess.autoProcessGames import autoProcessGames from nzbtomedia.autoProcess.autoProcessMovie import autoProcessMovie diff --git a/nzbtomedia/nzbToMediaUtil.py b/nzbtomedia/nzbToMediaUtil.py index ac14be02..68cb242e 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -6,8 +6,6 @@ import struct import shutil import time import datetime -import requests -import guessit import nzbtomedia from nzbtomedia.extractor import extractor @@ -545,8 +543,8 @@ def find_download(clientAgent, download_id): params['output'] = 'json' params['value'] = download_id try: - r = requests.get(url, params=params) - except requests.ConnectionError: + r = nzbtomedia.requests.get(url, params=params) + except nzbtomedia.requests.ConnectionError: logger.error("Unable to open URL") return 1 # failure @@ -630,7 +628,7 @@ def find_imdbid(dirName, inputName): return imdbid logger.info('Searching IMDB for imdbID ...') - guess = guessit.guess_movie_info(inputName) + guess = nzbtomedia.guessit.guess_movie_info(inputName) if guess: # Movie Title title = None @@ -647,8 +645,8 @@ def find_imdbid(dirName, inputName): logger.debug("Opening URL: %s" % url) try: - r = requests.get(url, params={'y': year, 't': title}) - except requests.ConnectionError: + r = nzbtomedia.requests.get(url, params={'y': year, 't': title}) + except nzbtomedia.requests.ConnectionError: logger.error("Unable to open URL %s" % url) return