[SCM] morituri/master: * morituri/common/musicbrainz.py: * morituri/rip/debug.py: Doc/output fixes.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 131535cde5da348bf1c29c3ecd4384b1c1732adf
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Wed Oct 19 18:45:22 2011 +0000

    	* morituri/common/musicbrainz.py:
    	* morituri/rip/debug.py:
    	  Doc/output fixes.

diff --git a/ChangeLog b/ChangeLog
index 40a7661..bf09c91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-10-19  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+	* morituri/common/musicbrainz.py:
+	* morituri/rip/debug.py:
+	  Doc/output fixes.
+
+2011-10-19  Thomas Vander Stichele  <thomas at apestaart dot org>
+
 	* morituri/rip/debug.py:
 	  Adapt to splitup.
 
diff --git a/morituri/common/musicbrainz.py b/morituri/common/musicbrainz.py
index e16ad58..e49bb89 100644
--- a/morituri/common/musicbrainz.py
+++ b/morituri/common/musicbrainz.py
@@ -132,6 +132,13 @@ def _getMetadata(release):
 # see http://bugs.musicbrainz.org/browser/python-musicbrainz2/trunk/examples/ripper.py
 def musicbrainz(discid):
     """
+    Based on a MusicBrainz disc id, get a list of DiscMetadata objects
+    for the given disc id.
+
+    Example disc id: Mj48G109whzEmAbPBoGvd4KyCS4-
+
+    @type  discid: str
+
     @rtype: list of L{DiscMetadata}
     """
     log.debug('musicbrainz', 'looking up results for discid %r', discid)
diff --git a/morituri/rip/debug.py b/morituri/rip/debug.py
index 7206892..e64572a 100644
--- a/morituri/rip/debug.py
+++ b/morituri/rip/debug.py
@@ -106,7 +106,7 @@ class MusicBrainz(logcommand.LogCommand):
             self.stdout.write('    Tracks: %r\n' % len(md.tracks))
             for j, track in enumerate(md.tracks):
                 self.stdout.write('      Track %2d: %r - %r\n' % (
-                    j, track.artist, track.title))
+                    j + 1, track.artist, track.title))
 
 class Debug(logcommand.LogCommand):
     summary = "debug internals"

-- 
morituri packaging