diff --git a/core/autoProcess/autoProcessComics.py b/core/autoProcess/autoProcessComics.py index f2f75f50..10fe6ec9 100644 --- a/core/autoProcess/autoProcessComics.py +++ b/core/autoProcess/autoProcessComics.py @@ -71,7 +71,7 @@ class autoProcessComics(object): if "Post Processing SUCCESSFUL" in line: success = True - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: 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))] diff --git a/core/autoProcess/autoProcessGames.py b/core/autoProcess/autoProcessGames.py index 2056cbbb..a08a8675 100644 --- a/core/autoProcess/autoProcessGames.py +++ b/core/autoProcess/autoProcessGames.py @@ -78,7 +78,7 @@ class autoProcessGames(object): logger.error("No library specified to move files to. Please edit your configuration.", section) return [1, "%s: Failed to post-process - No library defined in %s" % (section, section)] - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: 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 result['success']: diff --git a/core/autoProcess/autoProcessMovie.py b/core/autoProcess/autoProcessMovie.py index 42af0787..773fda93 100644 --- a/core/autoProcess/autoProcessMovie.py +++ b/core/autoProcess/autoProcessMovie.py @@ -213,7 +213,7 @@ class autoProcessMovie(object): 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): - if not release and not ".cp(tt" in video and imdbid: + if not release and ".cp(tt" not in video and imdbid: videoName, videoExt = os.path.splitext(video) video2 = "%s.cp(%s)%s" % (videoName, imdbid, videoExt) if not (clientAgent in [core.TORRENT_CLIENTAGENT, 'manual'] and core.USELINK == 'move-sym'): @@ -248,7 +248,7 @@ class autoProcessMovie(object): return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section)] result = r.json() - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: 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 result['success']: @@ -290,7 +290,7 @@ class autoProcessMovie(object): return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section)] result = r.json() - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: 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 result['success']: @@ -311,7 +311,7 @@ class autoProcessMovie(object): return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section)] result = r.json() - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: 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 result['success']: diff --git a/core/autoProcess/autoProcessMusic.py b/core/autoProcess/autoProcessMusic.py index 2936f9d4..d5b79134 100644 --- a/core/autoProcess/autoProcessMusic.py +++ b/core/autoProcess/autoProcessMusic.py @@ -117,7 +117,7 @@ class autoProcessMusic(object): logger.debug("Result: %s" % (r.text), section) - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: 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": diff --git a/core/autoProcess/autoProcessTV.py b/core/autoProcess/autoProcessTV.py index ac3005a6..a701f688 100644 --- a/core/autoProcess/autoProcessTV.py +++ b/core/autoProcess/autoProcessTV.py @@ -24,7 +24,7 @@ class autoProcessTV(object): except requests.ConnectionError: logger.error("Unable to open URL: %s" % (url1), section) return None - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: logger.error("Server returned status %s" % (str(r.status_code)), section) return None else: @@ -41,7 +41,7 @@ class autoProcessTV(object): except requests.ConnectionError: logger.error("Unable to open URL: %s" % (url2), section) return False - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: logger.error("Server returned status %s" % (str(r.status_code)), section) return False else: @@ -136,7 +136,7 @@ class autoProcessTV(object): if e.errno != errno.EEXIST: raise - if not 'process_method' in fork_params or (clientAgent in ['nzbget', 'sabnzbd'] and nzbExtractionBy != "Destination"): + if 'process_method' not in fork_params or (clientAgent in ['nzbget', 'sabnzbd'] and nzbExtractionBy != "Destination"): if inputName: process_all_exceptions(inputName, dirName) inputName, dirName = convert_to_ascii(inputName, dirName) @@ -288,7 +288,7 @@ class autoProcessTV(object): logger.error("Unable to open URL: %s" % (url), section) return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section)] - if not r.status_code in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: + if r.status_code not in [requests.codes.ok, requests.codes.created, requests.codes.accepted]: 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))]