Merge branch 'master' into 1067

beetsplug/echonest.py

@@ -177,7 +177,7 @@ class EchonestMetadataPlugin(plugins.BeetsPlugin):
         else:
             # If we exited the loop without breaking, then we used up all
             # our allotted retries.
-            raise ui.UserError(u'echonest request failed repeatedly')
+            log.error(u'echonest request failed repeatedly')
             return None
         return result
 

beetsplug/lyrics.py

@@ -393,7 +393,7 @@ def fetch_google(artist, title):
     if 'items' in data.keys():
         for item in data['items']:
             urlLink = item['link']
-            urlTitle = item['title']
+            urlTitle = item.get('title', u'')
             if not is_page_candidate(urlLink, urlTitle, title, artist):
                 continue
 

docs/changelog.rst

@@ -103,6 +103,10 @@ And countless little improvements and fixes:
 * Fix an issue where modifying an album's field without actually changing it
   would not update the corresponding tracks to bring differing tracks back in
   line with the album. :bug:`856`
+* :doc:`/plugins/echonest`: When communicating with the Echo Nest servers
+  fails repeatedly, log an error instead of exiting. :bug:`1096`
+* :doc:`/plugins/lyrics`: Avoid an error when the Google source returns a
+  result without a title. Thanks to Alberto Leal. :bug:`1097`
 
 
 1.3.8 (September 17, 2014)

docs/faq.rst

@@ -250,11 +250,11 @@ to see which version added the plugin. (You can type ``beet version`` to
 check which version of beets you have installed.)
 
 If you want to live on the bleeding edge and use the latest source
-version of beets, you can check out the source (see the next question).
+version of beets, you can check out the source (see :ref:`the relevant
+question <src>`).
 
 To see the beets documentation for your version (and avoid confusion
-with new features in trunk), select your version from the
-left-hand sidebar (or the buttons at the bottom of the window).
+with new features in trunk), select your version from the menu in the sidebar.
 
 
 .. _kill:

test/test_importer.py

@@ -382,7 +382,7 @@ class ImportRarTest(ImportZipTest):
         return os.path.join(_common.RSRC, 'archive.rar')
 
 
-@unittest.skip('Implment me!')
+@unittest.skip('Implement me!')
 class ImportPasswordRarTest(ImportZipTest):
 
     def create_archive(self):