From 2f7ee9ff08e67f27a777ce625da036266769929c Mon Sep 17 00:00:00 2001 From: echel0n Date: Tue, 22 Apr 2014 08:20:48 -0700 Subject: [PATCH] More lib fixes --- nzbtomedia/__init__.py | 2 -- nzbtomedia/nzbToMediaUtil.py | 12 +++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nzbtomedia/__init__.py b/nzbtomedia/__init__.py index 0107bd4c..57cb44fb 100644 --- a/nzbtomedia/__init__.py +++ b/nzbtomedia/__init__.py @@ -20,8 +20,6 @@ CONFIG_SPEC_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg.spec') CONFIG_MOVIE_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMovie.cfg') CONFIG_TV_FILE = os.path.join(PROGRAM_DIR, 'autoProcessTv.cfg') -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 991aadd7..e504dab3 100644 --- a/nzbtomedia/nzbToMediaUtil.py +++ b/nzbtomedia/nzbToMediaUtil.py @@ -6,6 +6,8 @@ import struct import shutil import time import datetime +import guessit +import requests import nzbtomedia from nzbtomedia.extractor import extractor @@ -543,8 +545,8 @@ def find_download(clientAgent, download_id): params['output'] = 'json' params['value'] = download_id try: - r = nzbtomedia.requests.get(url, params=params) - except nzbtomedia.requests.ConnectionError: + r = requests.get(url, params=params) + except requests.ConnectionError: logger.error("Unable to open URL") return 1 # failure @@ -628,7 +630,7 @@ def find_imdbid(dirName, inputName): return imdbid logger.info('Searching IMDB for imdbID ...') - guess = nzbtomedia.guessit.guess_movie_info(inputName) + guess = guessit.guess_movie_info(inputName) if guess: # Movie Title title = None @@ -645,8 +647,8 @@ def find_imdbid(dirName, inputName): logger.debug("Opening URL: %s" % url) try: - r = nzbtomedia.requests.get(url, params={'y': year, 't': title}) - except nzbtomedia.requests.ConnectionError: + r = requests.get(url, params={'y': year, 't': title}) + except requests.ConnectionError: logger.error("Unable to open URL %s" % url) return