From 0a1fe843062e2aa8dc1f9af5c52b786cb1f474b3 Mon Sep 17 00:00:00 2001 From: labrys Date: Tue, 31 May 2016 03:38:54 -0400 Subject: [PATCH] Convert to new-style class by inheriting from object --- core/autoProcess/autoProcessComics.py | 3 ++- core/autoProcess/autoProcessGames.py | 3 ++- core/autoProcess/autoProcessMovie.py | 7 ++++--- core/autoProcess/autoProcessMusic.py | 5 +++-- core/autoProcess/autoProcessTV.py | 3 ++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/core/autoProcess/autoProcessComics.py b/core/autoProcess/autoProcessComics.py index a6329de2..528eff25 100644 --- a/core/autoProcess/autoProcessComics.py +++ b/core/autoProcess/autoProcessComics.py @@ -9,7 +9,8 @@ from core import logger requests.packages.urllib3.disable_warnings() -class autoProcessComics: + +class autoProcessComics(object): def processEpisode(self, section, dirName, inputName=None, status=0, clientAgent='manual', inputCategory=None): if int(status) != 0: logger.warning("FAILED DOWNLOAD DETECTED, nothing to process.",section) diff --git a/core/autoProcess/autoProcessGames.py b/core/autoProcess/autoProcessGames.py index 3c6d705b..1bce13aa 100644 --- a/core/autoProcess/autoProcessGames.py +++ b/core/autoProcess/autoProcessGames.py @@ -10,7 +10,8 @@ from core import logger requests.packages.urllib3.disable_warnings() -class autoProcessGames: + +class autoProcessGames(object): def process(self, section, dirName, inputName=None, status=0, clientAgent='manual', inputCategory=None): status = int(status) diff --git a/core/autoProcess/autoProcessMovie.py b/core/autoProcess/autoProcessMovie.py index d5652bb3..6f62096e 100644 --- a/core/autoProcess/autoProcessMovie.py +++ b/core/autoProcess/autoProcessMovie.py @@ -12,7 +12,8 @@ from core.transcoder import transcoder requests.packages.urllib3.disable_warnings() -class autoProcessMovie: + +class autoProcessMovie(object): def get_release(self, baseURL, imdbid=None, download_id=None, release_id=None): results = {} params = {} @@ -46,7 +47,7 @@ class autoProcessMovie: if 'error' in result: logger.error(str(result['error'])) else: - logger.error("no media found for id %s" % (params['id'])) + logger.error("no media found for id %s" % (params['id'])) return results # Gather release info and return it back, no need to narrow results @@ -210,7 +211,7 @@ class autoProcessMovie: else: logger.error("Transcoding failed for files in %s" % (dirName), section) return [1, "%s: Failed to post-process - Transcoding failed" % (section) ] - for video in listMediaFiles(dirName, media=True, audio=False, meta=False, archives=False): + for video in listMediaFiles(dirName, media=True, audio=False, meta=False, archives=False): if not release and not ".cp(tt" in video and imdbid: videoName, videoExt = os.path.splitext(video) video2 = "%s.cp(%s)%s" % (videoName, imdbid, videoExt) diff --git a/core/autoProcess/autoProcessMusic.py b/core/autoProcess/autoProcessMusic.py index cd9ce649..ccebe177 100644 --- a/core/autoProcess/autoProcessMusic.py +++ b/core/autoProcess/autoProcessMusic.py @@ -11,7 +11,8 @@ from core import logger requests.packages.urllib3.disable_warnings() -class autoProcessMusic: + +class autoProcessMusic(object): def get_status(self, url, apikey, dirName): logger.debug("Attempting to get current status for release:%s" % (os.path.basename(dirName))) @@ -121,7 +122,7 @@ class autoProcessMusic: logger.error("Server returned status %s" % (str(r.status_code)), section) return [1, "%s: Failed to post-process - Server returned status %s" % (section, str(r.status_code)) ] elif r.text == "OK": - logger.postprocess("SUCCESS: Post-Processing started for %s in folder %s ..." % (inputName, dirName),section) + logger.postprocess("SUCCESS: Post-Processing started for %s in folder %s ..." % (inputName, dirName),section) else: logger.error("FAILED: Post-Processing has NOT started for %s in folder %s. exiting!" % (inputName, dirName),section) return [1, "%s: Failed to post-process - Returned log from %s was not as expected." % (section, section) ] diff --git a/core/autoProcess/autoProcessTV.py b/core/autoProcess/autoProcessTV.py index cdc081ef..4237c101 100644 --- a/core/autoProcess/autoProcessTV.py +++ b/core/autoProcess/autoProcessTV.py @@ -16,7 +16,8 @@ from core.transcoder import transcoder requests.packages.urllib3.disable_warnings() -class autoProcessTV: + +class autoProcessTV(object): def command_complete(self, url, params, headers, section): try: r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60))