Fix musicbrainz-update branch merged pull request

Hopefully this commit fixes JoeLametta/whipper#16

morituri/common/mbngs.py

@@ -272,9 +272,9 @@ def musicbrainz(discid, country=None, record=False):
     ret = []
 
     try:
-        result = musicbrainz.get_releases_by_discid(discid,
+        result = musicbrainzngs.get_releases_by_discid(discid,
             includes=["artists", "recordings", "release-groups"])
-    except musicbrainz.ResponseError, e:
+    except musicbrainzngs.ResponseError, e:
         if isinstance(e.cause, urllib2.HTTPError):
             if e.cause.code == 404:
                 raise NotFoundException(e)
@@ -301,7 +301,7 @@ def musicbrainz(discid, country=None, record=False):
         # to get titles of recordings, we need to query the release with
         # artist-credits
 
-        res = musicbrainz.get_release_by_id(release['id'],
+        res = musicbrainzngs.get_release_by_id(release['id'],
             includes=["artists", "artist-credits", "recordings", "discids",
                 "labels"])
         _record(record, 'release', release['id'], res)

morituri/common/program.py

@@ -344,7 +344,7 @@ class Program(log.Loggable):
                     record=self._record)
             except mbngs.NotFoundException, e:
                 break
-            except musicbrainz.NetworkError, e:
+            except musicbrainzngs.NetworkError, e:
                 self._stdout.write("Warning: network error: %r\n" % (e, ))
                 break
             except mbngs.MusicBrainzException, e:

morituri/rip/main.py

@@ -36,7 +36,7 @@ def main(argv):
 
     # set user agent
     import musicbrainzngs
-    musicbrainz.set_useragent("morituri", configure.version,
+    musicbrainzngs.set_useragent("morituri", configure.version,
         'https://thomas.apestaart.org/morituri/trac')