Changes given feedback on https://github.com/beetbox/beets/pull/3554 and trimmed sample html

beetsplug/lyrics.py

@@ -373,13 +373,14 @@ class Genius(Backend):
 
         # At least Genius is nice and has a tag called 'lyrics'!
         # Updated css where the lyrics are based in HTML.
-        try:
-            lyrics = html.find("div", class_="lyrics").get_text()
-        except AttributeError as exc:
-            # html is a NoneType cannot retrieve lyrics
-            self._log.debug(u'Genius lyrics for {0} not found: {1}',
-                            page_url, exc)
+        lyrics_div = html.find("div", class_="lyrics")
+
+        # nullcheck
+        if lyrics_div is None:
+            self._log.debug(u'Genius lyrics for {0} not found',
+                            page_url)
             return None
+        lyrics = lyrics_div.get_text()
 
         return lyrics
 

test/test_lyrics.py

@@ -453,12 +453,8 @@ class LyricsGeniusScrapTest(LyricsGeniusBaseTest):
         """
         # https://github.com/beetbox/beets/issues/3535
         # expected return value None
-        try:
-            self.assertEqual(genius.lyrics_from_song_api_path('/nolyric'),
-                             None)
-        except AttributeError:
-            # if AttributeError we aren't doing a null check
-            self.assertTrue(False)
+        self.assertEqual(genius.lyrics_from_song_api_path('/nolyric'),
+                         None)
 
 
 class SlugTests(unittest.TestCase):