[SCM] morituri/master: make sure sortname contains all artists

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a8ef4a54c46b45db848676b76b5e8c93407f211d
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Tue Jul 30 13:07:09 2013 +0200

    make sure sortname contains all artists

diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py
index 9543e8b..1fca73e 100644
--- a/morituri/common/mbngs.py
+++ b/morituri/common/mbngs.py
@@ -127,7 +127,7 @@ class _Credit(list):
 
 
     def getSortName(self):
-        return self.joiner(lambda i: i.get('sort-name'))
+        return self.joiner(lambda i: i.get('artist').get('sort-name', None))
 
     def getName(self):
         return self.joiner(lambda i: i.get('artist').get('name', None))
@@ -172,7 +172,7 @@ def _getMetadata(releaseShort, release, discid):
 
     # getUniqueName gets disambiguating names like Muse (UK rock band)
     discMD.artist = albumArtistName
-    discMD.sortName = discArtist['sort-name']
+    discMD.sortName = credit.getSortName()
     # FIXME: is format str ?
     if not 'date' in release:
         log.warning('mbngs', 'Release %r does not have date', release)
diff --git a/morituri/test/test_common_mbngs.py b/morituri/test/test_common_mbngs.py
index a06b958..0350429 100644
--- a/morituri/test/test_common_mbngs.py
+++ b/morituri/test/test_common_mbngs.py
@@ -62,8 +62,8 @@ class MetadataTestCase(unittest.TestCase):
         metadata = mbngs._getMetadata({}, response['release'], discid)
 
         self.assertEquals(metadata.artist, u'Isobel Campbell & Mark Lanegan')
-        # FIXME: this should include Mark
-        self.assertEquals(metadata.sortName, u'Campbell, Isobel')
+        self.assertEquals(metadata.sortName,
+            u'Campbell, Isobel & Lanegan, Mark')
         self.assertEquals(metadata.release, u'2006-01-30')
         # FIXME: this is only Isobel
         self.assertEquals(metadata.mbidArtist,

-- 
morituri packaging