conditional statement cleanup as suggested by @elelay

Author: E.S. Rosenberg a.k.a. Keeper of the Keys

src/gpodder/coverart.py

@@ -45,11 +45,11 @@ def __init__(self, core):
         self.core = core
 
     def get_cover(self, podcast, download=False, episode = None):
-        if episode != None:
+        if episode:
             # Get episode art.
             filename = episode.art_file
             cover_url = episode.episode_art_url
-            if cover_url is None:
+            if not cover_url:
                 return None
         else:
             # Get podcast cover.
@@ -91,7 +91,7 @@ def get_cover(self, podcast, download=False, episode = None):
                 fname, ext = os.path.splitext(filename)
 
                 # Check if an extension is part of the filename and that it matches the filetype
-                if ext != None and ext != '' :
+                if ext:
                     ext_unchanged = ext
                     # Assume last part of filename parts is extension
                     ext = ext.lower()
@@ -104,13 +104,13 @@ def get_cover(self, podcast, download=False, episode = None):
                             filename = fname
                             extension = ext_unchanged
                 # Filename did not include an extension or the extension did not match the filetype
-                if extension is None:
+                if not extension:
                     for filetype, check in list(self.SUPPORTED_EXTENSIONS.items()):
                         if check(data):
                             extension = filetype
                             break
 
-                if extension is None:
+                if not extension:
                     msg = 'Unknown file type: %s (%r)' % (cover_url, data[:6])
                     raise ValueError(msg)
 

src/gpodder/model.py

@@ -467,12 +467,12 @@ def update_from_dict(self, episode_dict):
 
     @property
     def art_file(self):
-        if self.episode_art_url != None and self.episode_art_url != '':
+        if self.episode_art_url:
             filename = self.guid
             try:
                 url = urlparse(self.episode_art_url)
                 filename = os.path.basename(url.path)
-            except:
+            except Exception:
                 logger.debug('urlparse failed for episode_art_url: %s', self.episode_art_url)
 
             return os.path.join(self.podcast.save_dir, filename)
@@ -577,7 +577,7 @@ def check_download_folder(self):
 
         for episode in self.episodes:
             filename = episode.art_file
-            if filename != None and filename != '':
+            if filename:
                 known_files.add(os.path.join(self.save_dir, filename))
 
         existing_files = {filename for filename in
@@ -782,7 +782,7 @@ def update(self):
             self._consume_custom_feed(result)
 
             # Download the cover art if it's not yet available, don't run if no save_dir was created yet.
-            if self.save_dir != None:
+            if self.save_dir:
                 self.model.core.cover_downloader.get_cover(self, download=True)
 
             self.save()

src/gpodder/plugins/soundcloud.py

@@ -108,7 +108,7 @@ def get_user_info(self):
     def get_coverart(self):
         user_info = self.get_user_info()
         avatar_url = user_info.get('avatar_url', None)
-        if avatar_url != None:
+        if avatar_url:
             # Soundcloud API by default returns the URL to "large" artwork - 100x100
             # by replacing "-large" with "-original" in the URL we get unresized files.
             return avatar_url.replace("-large", "-original")
@@ -164,7 +164,7 @@ def get_tracks(self, feed, channel):
         for track in tracks:
             # Prefer stream URL (MP3), fallback to download URL
             base_url = track.get('stream_url') if track['streamable'] else track.get('download_url')
-            if base_url != None:
+            if base_url:
                 url = base_url + '?consumer_key=%(consumer_key)s' % {'consumer_key': CONSUMER_KEY}
             else:
                 logger.debug('Skipping track with no base_url')
@@ -180,7 +180,7 @@ def get_tracks(self, feed, channel):
                 read_from_cache += 1
 
             artwork_url = track.get('artwork_url')
-            if artwork_url != None and artwork_url != '':
+            if artwork_url:
                 artwork_url = artwork_url.replace("-large", "-original")
 
             yield {