Code cleanup

couchpotato/core/providers/automation/imdb/main.py

@@ -58,7 +58,7 @@ class IMDBWatchlist(IMDBBase):
                         break
 
             except:
-                log.error('Failed loading IMDB watchlist: %s %s', (url, traceback.format_exc()))
+                log.error('Failed loading IMDB watchlist: %s %s', (watchlist_url, traceback.format_exc()))
 
         return movies
 

couchpotato/core/providers/info/omdbapi/main.py

@@ -98,7 +98,7 @@ class OMDBAPI(MovieProvider):
                 'mpaa': str(movie.get('Rated', '')),
                 'runtime': self.runtimeToMinutes(movie.get('Runtime', '')),
                 'released': movie.get('Released'),
-                'year': year if isinstance(year, (int)) else None,
+                'year': year if isinstance(year, int) else None,
                 'plot': movie.get('Plot'),
                 'genres': splitString(movie.get('Genre', '')),
                 'directors': splitString(movie.get('Director', '')),

couchpotato/core/providers/info/themoviedb/main.py

@@ -23,7 +23,7 @@ class TheMovieDb(MovieProvider):
         tmdb3.set_cache(engine='file', filename=os.path.join(Env.get('cache_dir'), 'python', 'tmdb.cache'))
 
     def search(self, q, limit = 12):
-        ''' Find movie by name '''
+        """ Find movie by name """
 
         if self.isDisabled():
             return False
@@ -72,9 +72,6 @@ class TheMovieDb(MovieProvider):
         result = self.getCache(cache_key)
 
         if not result:
-            result = {}
-            movie = None
-
             try:
                 log.debug('Getting info: %s', cache_key)
                 movie = tmdb3.Movie(identifier)
@@ -129,7 +126,7 @@ class TheMovieDb(MovieProvider):
             movie_data['titles'].append(movie.originaltitle)
             for alt in movie.alternate_titles:
                 alt_name = alt.title
-                if alt_name and not alt_name in movie_data['titles'] and alt_name.lower() != 'none' and alt_name != None:
+                if alt_name and not alt_name in movie_data['titles'] and alt_name.lower() != 'none' and alt_name is not None:
                     movie_data['titles'].append(alt_name)
 
             movie_data['titles'] = list(set(movie_data['titles']))
@@ -149,6 +146,5 @@ class TheMovieDb(MovieProvider):
     def isDisabled(self):
         if self.conf('api_key') == '':
             log.error('No API key provided.')
-            True
-        else:
-            False
+            return True
+        return False

couchpotato/core/providers/metadata/base.py

@@ -82,8 +82,11 @@ class MetaDataBase(Plugin):
 
     def getThumbnail(self, movie_info = {}, data = {}, wanted_file_type = 'poster_original'):
         file_types = fireEvent('file.types', single = True)
-        for file_type in file_types:
-            if file_type.get('identifier') == wanted_file_type:
+        file_type = {}
+
+        for ft in file_types:
+            if ft.get('identifier') == wanted_file_type:
+                file_type = ft
                 break
 
         # See if it is in current files

couchpotato/core/providers/nzb/binsearch/main.py

@@ -86,8 +86,10 @@ class BinSearch(NZBProvider):
 
     def download(self, url = '', nzb_id = ''):
 
-        params = {'action': 'nzb'}
-        params[nzb_id] = 'on'
+        params = {
+            'action': 'nzb',
+            nzb_id: 'on'
+        }
 
         try:
             return self.urlopen(url, params = params, show_error = False)

couchpotato/core/providers/nzb/newznab/main.py

@@ -118,7 +118,7 @@ class Newznab(NZBProvider, RSS):
 
         return list
 
-    def belongsTo(self, url, provider = None):
+    def belongsTo(self, url, provider = None, host = None):
 
         hosts = self.getHosts()
 

couchpotato/core/providers/torrent/scenehd/main.py

@@ -65,7 +65,7 @@ class SceneHD(TorrentProvider):
                 log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
 
 
-    def getLoginParams(self, params):
+    def getLoginParams(self):
         return tryUrlencode({
             'username': self.conf('username'),
             'password': self.conf('password'),

couchpotato/core/providers/torrent/thepiratebay/main.py

@@ -86,10 +86,10 @@ class ThePirateBay(TorrentMagnetProvider):
                         if link and download:
 
                             def extra_score(item):
-                                trusted = (0, 10)[result.find('img', alt = re.compile('Trusted')) != None]
-                                vip = (0, 20)[result.find('img', alt = re.compile('VIP')) != None]
-                                confirmed = (0, 30)[result.find('img', alt = re.compile('Helpers')) != None]
-                                moderated = (0, 50)[result.find('img', alt = re.compile('Moderator')) != None]
+                                trusted = (0, 10)[result.find('img', alt = re.compile('Trusted')) is not None]
+                                vip = (0, 20)[result.find('img', alt = re.compile('VIP')) is not None]
+                                confirmed = (0, 30)[result.find('img', alt = re.compile('Helpers')) is not None]
+                                moderated = (0, 50)[result.find('img', alt = re.compile('Moderator')) is not None]
 
                                 return confirmed + trusted + vip + moderated
 

couchpotato/core/providers/userscript/allocine/main.py

@@ -19,9 +19,6 @@ class AlloCine(UserscriptBase):
         except:
             return
 
-        name = None
-        year = None
-
         try:
             start = data.find('<title>')
             end = data.find('</title>', start)