diff --git a/sickbeard/providers/alpharatio.py b/sickbeard/providers/alpharatio.py index d2b096faeaf39bf4d6f50670703fe57d38e57467..0e58915fa0e4e706f6c9e0334d592e71f2fb31dd 100644 --- a/sickbeard/providers/alpharatio.py +++ b/sickbeard/providers/alpharatio.py @@ -85,7 +85,7 @@ class AlphaRatioProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urls['search'] % (search_string, self.categories) @@ -125,12 +125,12 @@ class AlphaRatioProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/bitcannon.py b/sickbeard/providers/bitcannon.py index 54ea2276879e6a796187d287a8b9addf0ce57d7a..ebdd16551107fca7e2a21f9d60234da964f5529e 100644 --- a/sickbeard/providers/bitcannon.py +++ b/sickbeard/providers/bitcannon.py @@ -75,7 +75,7 @@ class BitCannonProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue @@ -83,7 +83,7 @@ class BitCannonProvider(generic.TorrentProvider): download_url = 'magnet:?xt=urn:btih:%s&dn=%s&tr=%s' % (info_hash, quote_plus(title.encode('utf-8')), u'&tr='.join([quote_plus(x.encode('utf-8')) for x in trackers])) item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/bitsoup.py b/sickbeard/providers/bitsoup.py index 162f7b3bc1fb63f8c236a443f5b28f2b7a4c9faf..e25855c9deee2c8029bee140220fb234dc4fc253 100644 --- a/sickbeard/providers/bitsoup.py +++ b/sickbeard/providers/bitsoup.py @@ -89,7 +89,7 @@ class BitSoupProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) self.search_params['search'] = search_string @@ -128,12 +128,12 @@ class BitSoupProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/bluetigers.py b/sickbeard/providers/bluetigers.py index 5cd45d00c592f90d9b12344f926a867501d0eff2..561503a401732b3df83c43ef7da75950493d16fc 100644 --- a/sickbeard/providers/bluetigers.py +++ b/sickbeard/providers/bluetigers.py @@ -93,7 +93,7 @@ class BLUETIGERSProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) self.search_params['search'] = search_string @@ -125,12 +125,12 @@ class BLUETIGERSProvider(generic.TorrentProvider): # Filter unseeded torrent # if seeders < self.minseed or leechers < self.minleech: - # if mode is not 'RSS': + # if mode != 'RSS': # logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) # continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/btdigg.py b/sickbeard/providers/btdigg.py index 553e7e320bfcd1a66395b6c964a350d9e31e5ca2..4eda679d1cdf9e9371d3566cdcf4b02ad4aaaa8f 100644 --- a/sickbeard/providers/btdigg.py +++ b/sickbeard/providers/btdigg.py @@ -55,11 +55,11 @@ class BTDIGGProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s" % search_string, logger.DEBUG) search_params['q'] = search_string.encode('utf-8') - search_params['order'] = '1' if mode is not 'RSS' else '2' + search_params['order'] = '1' if mode != 'RSS' else '2' searchURL = self.urls['api'] + '?' + urlencode(search_params) logger.log(u"Search URL: %s" % searchURL, logger.DEBUG) @@ -83,12 +83,12 @@ class BTDIGGProvider(generic.TorrentProvider): # Filter unseeded torrent (Unsupported) # if seeders < self.minseed or leechers < self.minleech: - # if mode is not 'RSS': + # if mode != 'RSS': # logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) # continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s" % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/cpasbien.py b/sickbeard/providers/cpasbien.py index 67641af0006547fd78cb73d998bf3508d14bd042..e91160f8db116325b9629173d66b48db37b3678e 100644 --- a/sickbeard/providers/cpasbien.py +++ b/sickbeard/providers/cpasbien.py @@ -49,7 +49,7 @@ class CpasbienProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.url + '/recherche/'+search_string.replace('.', '-') + '.html' @@ -101,7 +101,7 @@ class CpasbienProvider(generic.TorrentProvider): continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/extratorrent.py b/sickbeard/providers/extratorrent.py index d16cccb75180c752bf8fccc6c906c176f44fdcde..eda874561dfa78266ab8f8fe4bd592cd64100af4 100644 --- a/sickbeard/providers/extratorrent.py +++ b/sickbeard/providers/extratorrent.py @@ -58,7 +58,7 @@ class ExtraTorrentProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) try: @@ -99,12 +99,12 @@ class ExtraTorrentProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/fnt.py b/sickbeard/providers/fnt.py index 52f83e8a32985ffb9ca1129eb9efc874ea2f8fb7..78bc2d1ea74e333a8bdb062758d06ed2e91a7de2 100644 --- a/sickbeard/providers/fnt.py +++ b/sickbeard/providers/fnt.py @@ -90,7 +90,7 @@ class FNTProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) self.search_params['recherche'] = search_string @@ -135,12 +135,12 @@ class FNTProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/freshontv.py b/sickbeard/providers/freshontv.py index 9038c819df2e041e79b55ba45a731a1d85859b37..d0cc75351f1bbf564358aa889cd56d40f9ff5c04 100644 --- a/sickbeard/providers/freshontv.py +++ b/sickbeard/providers/freshontv.py @@ -117,7 +117,7 @@ class FreshOnTVProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urls['search'] % (freeleech, search_string) @@ -215,12 +215,12 @@ class FreshOnTVProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/gftracker.py b/sickbeard/providers/gftracker.py index 826e42ccf49dbda3a63661c9f5cf626d89f2e161..14d6656cdda3a1050548120b441c249d78675049 100644 --- a/sickbeard/providers/gftracker.py +++ b/sickbeard/providers/gftracker.py @@ -94,7 +94,7 @@ class GFTrackerProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urls['search'] % (self.categories, search_string) @@ -146,12 +146,12 @@ class GFTrackerProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/hdspace.py b/sickbeard/providers/hdspace.py index 48eec48a7180d1cb79130ceb3e37c5efd1a39178..5a61844d13a233194b2cd0faa0800669f8b24e55 100644 --- a/sickbeard/providers/hdspace.py +++ b/sickbeard/providers/hdspace.py @@ -93,13 +93,13 @@ class HDSpaceProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': searchURL = self.urls['search'] % (urllib.quote_plus(search_string.replace('.', ' ')),) else: searchURL = self.urls['search'] % '' logger.log(u"Search URL: %s" % searchURL, logger.DEBUG) - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s" % search_string, logger.DEBUG) data = self.getURL(searchURL) @@ -145,12 +145,12 @@ class HDSpaceProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/hdtorrents.py b/sickbeard/providers/hdtorrents.py index e2708f3cdd8db40a231cc133930e7aba15b8bfa4..4183f702686d7d68f975bb8e59e5e86fff1798b0 100644 --- a/sickbeard/providers/hdtorrents.py +++ b/sickbeard/providers/hdtorrents.py @@ -92,13 +92,13 @@ class HDTorrentsProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': searchURL = self.urls['search'] % (urllib.quote_plus(search_string), self.categories) else: searchURL = self.urls['rss'] % self.categories logger.log(u"Search URL: %s" % searchURL, logger.DEBUG) - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s" % search_string, logger.DEBUG) data = self.getURL(searchURL) @@ -177,12 +177,12 @@ class HDTorrentsProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/hounddawgs.py b/sickbeard/providers/hounddawgs.py index 3736bfcb4d4bde0066dc9b69c71e5e8dfcdec5f5..704320e3e57ffd5b3cbd2374716d5e7b29ff7d3f 100644 --- a/sickbeard/providers/hounddawgs.py +++ b/sickbeard/providers/hounddawgs.py @@ -95,7 +95,7 @@ class HoundDawgsProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) self.search_params['searchstr'] = search_string @@ -157,12 +157,12 @@ class HoundDawgsProvider(generic.TorrentProvider): # Filter unseeded torrent # if seeders < self.minseed or leechers < self.minleech: - # if mode is not 'RSS': + # if mode != 'RSS': # logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) # continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/iptorrents.py b/sickbeard/providers/iptorrents.py index 000c9b03e42f0f19a84169d051d85f44bdcc5ac4..12c29eb991a7c1cfecb980ba437a8d78bc60f239 100644 --- a/sickbeard/providers/iptorrents.py +++ b/sickbeard/providers/iptorrents.py @@ -90,12 +90,12 @@ class IPTorrentsProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) # URL with 50 tv-show results, or max 150 if adjusted in IPTorrents profile searchURL = self.urls['search'] % (self.categories, freeleech, search_string) - searchURL += ';o=seeders' if mode is not 'RSS' else '' + searchURL += ';o=seeders' if mode != 'RSS' else '' logger.log(u"Search URL: %s" % searchURL, logger.DEBUG) data = self.getURL(searchURL) @@ -136,12 +136,12 @@ class IPTorrentsProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py index ba84c2584970e4644f08623cf96bfc701a6f34ae..0a0a79a81486a754e3677cb050b093c425992367 100755 --- a/sickbeard/providers/kat.py +++ b/sickbeard/providers/kat.py @@ -75,13 +75,13 @@ class KATProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - self.search_params['q'] = search_string.encode('utf-8') if mode is not 'RSS' else '' - self.search_params['field'] = 'seeders' if mode is not 'RSS' else 'time_add' + self.search_params['q'] = search_string.encode('utf-8') if mode != 'RSS' else '' + self.search_params['field'] = 'seeders' if mode != 'RSS' else 'time_add' - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s" % search_string, logger.DEBUG) - url_fmt_string = 'usearch' if mode is not 'RSS' else search_string + url_fmt_string = 'usearch' if mode != 'RSS' else search_string try: searchURL = self.urls['search'] % url_fmt_string + '?' + urlencode(self.search_params) logger.log(u"Search URL: %s" % searchURL, logger.DEBUG) @@ -127,17 +127,17 @@ class KATProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue if self.confirmed and not verified: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result " + title + " but that doesn't seem like a verified result so I'm ignoring it", logger.DEBUG) continue item = title, download_url, size, seeders, leechers, info_hash - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/libertalia.py b/sickbeard/providers/libertalia.py index dc2a9a5141570b2c3774eead9bd91bdf2a026c47..657f3be0e50398ff0d602e7d20d9beb6c4e3d386 100644 --- a/sickbeard/providers/libertalia.py +++ b/sickbeard/providers/libertalia.py @@ -87,7 +87,7 @@ class LibertaliaProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urlsearch % (urllib.quote(search_string), self.categories) @@ -121,12 +121,12 @@ class LibertaliaProvider(generic.TorrentProvider): # Filter unseeded torrent # if seeders < self.minseed or leechers < self.minleech: - # if mode is not 'RSS': + # if mode != 'RSS': # logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) # continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/morethantv.py b/sickbeard/providers/morethantv.py index 10bfeb7052acf581d83b36a47b0f0b28665ffdd9..82ad0842a77235dde2fa4cd4252a2eaa931a2558 100644 --- a/sickbeard/providers/morethantv.py +++ b/sickbeard/providers/morethantv.py @@ -106,7 +106,7 @@ class MoreThanTVProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urls['search'] % (search_string.replace('(', '').replace(')', '')) @@ -162,12 +162,12 @@ class MoreThanTVProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/newpct.py b/sickbeard/providers/newpct.py index 1332d0e4628f354f9a72916c114c6741f91008aa..3bcd2caaffb668c71f5d06d7670bf2259f0e0861 100644 --- a/sickbeard/providers/newpct.py +++ b/sickbeard/providers/newpct.py @@ -92,7 +92,7 @@ class newpctProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) self.search_params.update({'q': search_string.strip()}) @@ -136,12 +136,12 @@ class newpctProvider(generic.TorrentProvider): # Filter unseeded torrent (Unsupported) # if seeders < self.minseed or leechers < self.minleech: - # if mode is not 'RSS': + # if mode != 'RSS': # logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) # continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/nextgen.py b/sickbeard/providers/nextgen.py index 08e575da4364b18283be23c117d8dbf8ce1b67c2..5915ff6a5f999b815dc9bd88e35bb92caa5850b7 100644 --- a/sickbeard/providers/nextgen.py +++ b/sickbeard/providers/nextgen.py @@ -122,7 +122,7 @@ class NextGenProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urls['search'] % (urllib.quote(search_string.encode('utf-8')), self.categories) @@ -171,12 +171,12 @@ class NextGenProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/nyaatorrents.py b/sickbeard/providers/nyaatorrents.py index ee7ef56343002f1163f55d7743f39f6adff1d441..1b58081c1697783adab1a487496cec72168a57ac 100644 --- a/sickbeard/providers/nyaatorrents.py +++ b/sickbeard/providers/nyaatorrents.py @@ -55,7 +55,7 @@ class NyaaProvider(generic.TorrentProvider): for mode in search_strings.keys(): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s" % search_string, logger.DEBUG) params = { @@ -64,7 +64,7 @@ class NyaaProvider(generic.TorrentProvider): "sort": 2, # Sort Descending By Seeders "order": 1 } - if mode is not 'RSS': + if mode != 'RSS': params["term"] = search_string.encode('utf-8') searchURL = self.url + '?' + urllib.urlencode(params) @@ -85,16 +85,16 @@ class NyaaProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue - if self.confirmed and not verified and mode is not 'RSS': + if self.confirmed and not verified and mode != 'RSS': logger.log(u"Found result " + title + " but that doesn't seem like a verified result so I'm ignoring it", logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/pretome.py b/sickbeard/providers/pretome.py index f165135dd6b09a1ebf9ae419bf5743b6e7edc7e4..30dbac2d2efaa2d74f989ae7ab462f28c16315f0 100644 --- a/sickbeard/providers/pretome.py +++ b/sickbeard/providers/pretome.py @@ -91,7 +91,7 @@ class PretomeProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urls['search'] % (urllib.quote(search_string.encode('utf-8')), self.categories) @@ -148,12 +148,12 @@ class PretomeProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/rarbg.py b/sickbeard/providers/rarbg.py index 5a20d093f12681ee383a5a11da83e89c17267a8b..f2b2bb362f26604ff8559eacfa3625d7b8456ee9 100644 --- a/sickbeard/providers/rarbg.py +++ b/sickbeard/providers/rarbg.py @@ -119,7 +119,7 @@ class RarbgProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) if mode is 'RSS': @@ -226,7 +226,7 @@ class RarbgProvider(generic.TorrentProvider): continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/scc.py b/sickbeard/providers/scc.py index 67159e3e5867a320d5379ecffbbd55e513348120..c02ac02d5a63bd6fb2dc7b404fbf5d7525129953 100644 --- a/sickbeard/providers/scc.py +++ b/sickbeard/providers/scc.py @@ -89,10 +89,10 @@ class SCCProvider(generic.TorrentProvider): items = {'Season': [], 'Episode': [], 'RSS': []} for mode in search_strings.keys(): - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urls['search'] % (urllib.quote(search_string), self.categories[search_mode]) @@ -140,12 +140,12 @@ class SCCProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/scenetime.py b/sickbeard/providers/scenetime.py index 92dabe2a0ce0a4df2f9aa4577ff8557b626a943f..c4136a07c4fc8a385fce958b5a2b1dc36e35ceda 100644 --- a/sickbeard/providers/scenetime.py +++ b/sickbeard/providers/scenetime.py @@ -81,7 +81,7 @@ class SceneTimeProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urls['search'] % (urllib.quote(search_string), self.categories) @@ -132,12 +132,12 @@ class SceneTimeProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/speedcd.py b/sickbeard/providers/speedcd.py index a3c5377a8a474674e1f596e97e7706df4a813924..b5fe4feab1f0d11e383934e3c1e9f06172bb4cbb 100644 --- a/sickbeard/providers/speedcd.py +++ b/sickbeard/providers/speedcd.py @@ -80,7 +80,7 @@ class SpeedCDProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) search_string = '+'.join(search_string.split()) @@ -114,12 +114,12 @@ class SpeedCDProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/strike.py b/sickbeard/providers/strike.py index 7f03fd5de6d7f2cdb866d6f82281ec5b00d5d9c3..a761eb5b893df139042b0afce2c2c95a6f9e05f1 100644 --- a/sickbeard/providers/strike.py +++ b/sickbeard/providers/strike.py @@ -42,7 +42,7 @@ class STRIKEProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: " + search_string.strip(), logger.DEBUG) searchURL = self.url + "api/v2/torrents/search/?category=TV&phrase=" + search_string @@ -66,11 +66,11 @@ class STRIKEProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) item = title, download_url, size, seeders, leechers diff --git a/sickbeard/providers/t411.py b/sickbeard/providers/t411.py index 4a1d4d2f9aff776ad6ff46cee3d7720a1a6dc29f..55375b41a8fff87e4a3c5844b70ed59a12af272b 100644 --- a/sickbeard/providers/t411.py +++ b/sickbeard/providers/t411.py @@ -90,7 +90,7 @@ class T411Provider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURLS = ([self.urls['search'] % (search_string, u) for u in self.subcategories], [self.urls['rss']])[mode is 'RSS'] @@ -101,11 +101,11 @@ class T411Provider(generic.TorrentProvider): continue try: - if 'torrents' not in data and mode is not 'RSS': + if 'torrents' not in data and mode != 'RSS': logger.log(u"Data returned from provider does not contain any torrents", logger.DEBUG) continue - torrents = data['torrents'] if mode is not 'RSS' else data + torrents = data['torrents'] if mode != 'RSS' else data if not torrents: logger.log(u"Data returned from provider does not contain any torrents", logger.DEBUG) @@ -129,16 +129,16 @@ class T411Provider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue - if self.confirmed and not verified and mode is not 'RSS': + if self.confirmed and not verified and mode != 'RSS': logger.log(u"Found result " + title + " but that doesn't seem like a verified result so I'm ignoring it", logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/thepiratebay.py b/sickbeard/providers/thepiratebay.py index aba4c0b2ed1997f8b8c497597a9a9766d8f2e16a..79aaa0fd1cddcb02ad4039d1508ee6cb51b01f4d 100644 --- a/sickbeard/providers/thepiratebay.py +++ b/sickbeard/providers/thepiratebay.py @@ -75,7 +75,7 @@ class ThePirateBayProvider(generic.TorrentProvider): self.search_params.update({'q': search_string.strip()}) - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: " + search_string, logger.DEBUG) searchURL = self.urls[('search', 'rss')[mode is 'RSS']] + '?' + urlencode(self.search_params) @@ -99,18 +99,18 @@ class ThePirateBayProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue # Accept Torrent only from Good People for every Episode Search if self.confirmed and re.search(r'(VIP|Trusted|Helper|Moderator)', torrent.group(0)) is None: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result %s but that doesn't seem like a trusted result so I'm ignoring it" % title, logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/titansoftv.py b/sickbeard/providers/titansoftv.py index 5281e199a3928e25df8a46a6210e507392dcdaf9..cea172b8bd6cd41ed9a5afab296725cd490a8e14 100644 --- a/sickbeard/providers/titansoftv.py +++ b/sickbeard/providers/titansoftv.py @@ -96,7 +96,7 @@ class TitansOfTVProvider(generic.TorrentProvider): # Filter unseeded torrent # if seeders < self.minseed or leechers < self.minleech: - # if mode is not 'RSS': + # if mode != 'RSS': # logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) # continue diff --git a/sickbeard/providers/tntvillage.py b/sickbeard/providers/tntvillage.py index 5b4fc5d4fb8036ee739ac052dc0d46535eb13c13..c00842148d894428c82c6f309e7afa44dc9d37f7 100644 --- a/sickbeard/providers/tntvillage.py +++ b/sickbeard/providers/tntvillage.py @@ -300,12 +300,12 @@ class TNTVillageProvider(generic.TorrentProvider): if last_page: break - if mode is not 'RSS': + if mode != 'RSS': searchURL = (self.urls['search_page'] + '&filter={2}').format(z, self.categories, search_string) else: searchURL = self.urls['search_page'].format(z, self.categories) - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) logger.log(u"Search URL: %s" % searchURL, logger.DEBUG) @@ -379,12 +379,12 @@ class TNTVillageProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/tokyotoshokan.py b/sickbeard/providers/tokyotoshokan.py index ed7acce2a9950d6992d484e8cee6acf92e6ee3fd..6a078faa8de2c8459c887366350a89d79b1d4992 100644 --- a/sickbeard/providers/tokyotoshokan.py +++ b/sickbeard/providers/tokyotoshokan.py @@ -95,7 +95,7 @@ class TokyoToshokanProvider(generic.TorrentProvider): # Filter unseeded torrent # if seeders < self.minseed or leechers < self.minleech: - # if mode is not 'RSS': + # if mode != 'RSS': # logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) # continue diff --git a/sickbeard/providers/torrentbytes.py b/sickbeard/providers/torrentbytes.py index 30711eda2f6b62ddb9b4f378dc1e1e1987854f98..0a0d3a68a453a52169ef4ee46912320b052ea94d 100644 --- a/sickbeard/providers/torrentbytes.py +++ b/sickbeard/providers/torrentbytes.py @@ -84,7 +84,7 @@ class TorrentBytesProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urls['search'] % (urllib.quote(search_string.encode('utf-8')), self.categories) @@ -147,12 +147,12 @@ class TorrentBytesProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/torrentday.py b/sickbeard/providers/torrentday.py index 1d84445385dd6c11e7df7f754b65aed7db1b98dd..62550dab1691fff5d1d277d98ce36e2beb7ced46 100644 --- a/sickbeard/providers/torrentday.py +++ b/sickbeard/providers/torrentday.py @@ -102,7 +102,7 @@ class TorrentDayProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) search_string = '+'.join(search_string.split()) @@ -138,12 +138,12 @@ class TorrentDayProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/torrentleech.py b/sickbeard/providers/torrentleech.py index 2ab8987dcaa441a6788cb59c680f8442852d3d8f..7ccac63bb57895d8fd88f7fac4a85e164b373c66 100644 --- a/sickbeard/providers/torrentleech.py +++ b/sickbeard/providers/torrentleech.py @@ -125,12 +125,12 @@ class TorrentLeechProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/torrentproject.py b/sickbeard/providers/torrentproject.py index b9c52266d88910d4ea7ab80137ec22b5279499cc..2f84b81c8309da3ba1b787babf7bfc507026e772 100644 --- a/sickbeard/providers/torrentproject.py +++ b/sickbeard/providers/torrentproject.py @@ -48,7 +48,7 @@ class TORRENTPROJECTProvider(generic.TorrentProvider): for mode in search_strings.keys(): # Mode = RSS, Season, Episode logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) @@ -68,7 +68,7 @@ class TORRENTPROJECTProvider(generic.TorrentProvider): seeders = helpers.tryInt(torrents[i]["seeds"], 1) leechers = helpers.tryInt(torrents[i]["leechs"], 0) if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Torrent doesn't meet minimum seeds & leechers not selecting : %s" % title, logger.DEBUG) continue @@ -77,7 +77,7 @@ class TORRENTPROJECTProvider(generic.TorrentProvider): try: assert seeders < 10 - assert mode is not 'RSS' + assert mode != 'RSS' logger.log(u"Torrent has less than 10 seeds getting dyn trackers: " + title, logger.DEBUG) trackerUrl = self.urls['api'] + "" + t_hash + "/trackers_json" jdata = self.getURL(trackerUrl, json=True) @@ -91,7 +91,7 @@ class TORRENTPROJECTProvider(generic.TorrentProvider): item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s" % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/torrentz.py b/sickbeard/providers/torrentz.py index f1dd3e8ffaba848dfced0340fdbe8c4e770df8c5..576a8ca114fea8a6aef3a229e2cb20761e4d8e2a 100644 --- a/sickbeard/providers/torrentz.py +++ b/sickbeard/providers/torrentz.py @@ -63,7 +63,7 @@ class TORRENTZProvider(generic.TorrentProvider): for mode in search_strings: for search_string in search_strings[mode]: search_url = self.urls['verified'] if self.confirmed else self.urls['feed'] - if mode is not 'RSS': + if mode != 'RSS': search_url += '?q=' + urllib.parse.quote_plus(search_string) logger.log(search_url) @@ -112,7 +112,7 @@ class TORRENTZProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue diff --git a/sickbeard/providers/transmitthenet.py b/sickbeard/providers/transmitthenet.py index e4e5b30e79f0ef4931a0115c74dedd36880a1d24..2049b638ddb4b600d2425a1e32268f8db2d1c2c4 100644 --- a/sickbeard/providers/transmitthenet.py +++ b/sickbeard/providers/transmitthenet.py @@ -90,7 +90,7 @@ class TransmitTheNetProvider(generic.TorrentProvider): for mode in search_strings.keys(): for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) data = self.getURL(self.urls['index'], params=self.search_params) @@ -133,12 +133,12 @@ class TransmitTheNetProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/tvchaosuk.py b/sickbeard/providers/tvchaosuk.py index 49aab00075b0503218f75e6772d567116bda63eb..dee2176c41791fff58c385a2e5429c28f4b228b4 100644 --- a/sickbeard/providers/tvchaosuk.py +++ b/sickbeard/providers/tvchaosuk.py @@ -131,7 +131,7 @@ class TVChaosUKProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_strings[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) self.search_params['keywords'] = search_string.strip() @@ -156,7 +156,7 @@ class TVChaosUKProvider(generic.TorrentProvider): # Filter unseeded torrent if seeders < self.minseed or leechers < self.minleech: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) continue @@ -176,7 +176,7 @@ class TVChaosUKProvider(generic.TorrentProvider): size = -1 item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/providers/xthor.py b/sickbeard/providers/xthor.py index 71cf973b5fb0310756133e72110c6c825f0b0370..2805fbe5b6270d4f4b9cf6ea7511fab4600510a4 100644 --- a/sickbeard/providers/xthor.py +++ b/sickbeard/providers/xthor.py @@ -80,7 +80,7 @@ class XthorProvider(generic.TorrentProvider): logger.log(u"Search Mode: %s" % mode, logger.DEBUG) for search_string in search_params[mode]: - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Search string: %s " % search_string, logger.DEBUG) searchURL = self.urlsearch % (urllib.quote(search_string), self.categories) @@ -109,12 +109,12 @@ class XthorProvider(generic.TorrentProvider): # Filter unseeded torrent # if seeders < self.minseed or leechers < self.minleech: - # if mode is not 'RSS': + # if mode != 'RSS': # logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) # continue item = title, download_url, size, seeders, leechers - if mode is not 'RSS': + if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) items[mode].append(item) diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py index e61fe96f9cf19308cbe3c6ddf3a4f763eec30b0e..63829cab8dbcb6f28594ee9c8031dd803f2be4a7 100644 --- a/sickbeard/webapi.py +++ b/sickbeard/webapi.py @@ -1,3 +1,4 @@ +# coding=utf-8 # Author: Dennis Lutter <lad1337@gmail.com> # Author: Jonathon Saine <thezoggy@gmail.com> # URL: http://code.google.com/p/sickbeard/ @@ -221,7 +222,7 @@ class ApiHandler(RequestHandler): if cmdIndex is None: # do we need a index dict for this cmd ? outDict[cmd] = curOutDict else: - if not cmd in outDict: + if cmd not in outDict: outDict[cmd] = {} outDict[cmd][cmdIndex] = curOutDict else: @@ -263,7 +264,7 @@ class ApiHandler(RequestHandler): if kwarg.find(cmd + ".") == 0: cleanKey = kwarg.rpartition(".")[2] curKwargs[cleanKey] = kwargs[kwarg].lower() - elif not "." in kwarg: # the kwarg was not namespaced therefore a "global" + elif "." not in kwarg: # the kwarg was not namespaced therefore a "global" curKwargs[kwarg] = kwargs[kwarg] return curArgs, curKwargs @@ -304,7 +305,7 @@ class ApiCall(ApiHandler): if paramType in self._help: for paramName in paramDict: - if not paramName in self._help[paramType]: + if paramName not in self._help[paramType]: self._help[paramType][paramName] = {} if paramDict[paramName]["allowedValues"]: self._help[paramType][paramName]["allowedValues"] = paramDict[paramName]["allowedValues"] @@ -439,10 +440,10 @@ class ApiCall(ApiHandler): error = False if isinstance(value, list): for item in value: - if not item in allowedValues: + if item not in allowedValues: error = True else: - if not value in allowedValues: + if value not in allowedValues: error = True if error: @@ -751,7 +752,7 @@ class CMD_Episode(ApiCall): episode["location"] = "" # convert stuff to human form - if helpers.tryInt(episode['airdate'], 1) > 693595: # 1900 + if helpers.tryInt(episode['airdate'], 1) > 693595: # 1900 episode['airdate'] = sbdatetime.sbdatetime.sbfdate(sbdatetime.sbdatetime.convert_to_setting( network_timezones.parse_date_time(int(episode['airdate']), showObj.airs, showObj.network)), d_preset=dateFormat) @@ -1017,7 +1018,7 @@ class CMD_Exceptions(ApiCall): scene_exceptions = {} for row in sqlResults: indexerid = row["indexerid"] - if not indexerid in scene_exceptions: + if indexerid not in scene_exceptions: scene_exceptions[indexerid] = [] scene_exceptions[indexerid].append(row["show_name"]) @@ -1783,7 +1784,7 @@ class CMD_SickBeardSetDefaults(ApiCall): self.status = status break # this should be obsolete bcause of the above - if not self.status in statusStrings: + if self.status not in statusStrings: raise ApiError("Invalid Status") # only allow the status options we want if int(self.status) not in (3, 5, 6, 7): @@ -2549,7 +2550,7 @@ class CMD_ShowSeasons(ApiCall): curEpisode = int(row["episode"]) del row["season"] del row["episode"] - if not curSeason in seasons: + if curSeason not in seasons: seasons[curSeason] = {} seasons[curSeason][curEpisode] = row @@ -2572,7 +2573,7 @@ class CMD_ShowSeasons(ApiCall): row['airdate'] = sbdatetime.sbdatetime.sbfdate(dtEpisodeAirs, d_preset=dateFormat) else: row['airdate'] = 'Never' - if not curEpisode in seasons: + if curEpisode not in seasons: seasons[curEpisode] = {} seasons[curEpisode] = row