From 8ebd329a1973ecb780d11e2ae04a81dd1d9e2f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Fri, 19 May 2017 01:16:45 +0200 Subject: [PATCH] Fix capitalisation of MusicBrainz everywhere Make MusicBrainz consistently written as "MusicBrainz" and not "musicbrainz" or "Musicbrainz". Doesn't change instances that refer to the Python module or similar. --- whipper/command/cd.py | 2 +- whipper/common/mbngs.py | 4 ++-- whipper/common/program.py | 4 ++-- whipper/image/table.py | 2 +- whipper/test/test_image_table.py | 2 +- whipper/test/test_image_toc.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/whipper/command/cd.py b/whipper/command/cd.py index 15af8b0..a5e052f 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -212,7 +212,7 @@ class _CD(BaseCommand): class Info(_CD): summary = "retrieve information about the currently inserted CD" - description = ("Display musicbrainz, CDDB/FreeDB, and AccurateRip" + description = ("Display MusicBrainz, CDDB/FreeDB, and AccurateRip" "information for the currently inserted CD.") eject = False diff --git a/whipper/common/mbngs.py b/whipper/common/mbngs.py index a066d64..ffdc96f 100644 --- a/whipper/common/mbngs.py +++ b/whipper/common/mbngs.py @@ -19,7 +19,7 @@ # along with whipper. If not, see . """ -Handles communication with the musicbrainz server using NGS. +Handles communication with the MusicBrainz server using NGS. """ import urllib2 @@ -113,7 +113,7 @@ def _record(record, which, name, what): class _Credit(list): """ - I am a representation of an artist-credit in musicbrainz for a disc + I am a representation of an artist-credit in MusicBrainz for a disc or track. """ diff --git a/whipper/common/program.py b/whipper/common/program.py index 8dabcce..113365f 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -286,7 +286,7 @@ class Program: """ @type ittoc: L{whipper.image.table.Table} """ - # look up disc on musicbrainz + # look up disc on MusicBrainz self._stdout.write('Disc duration: %s, %d audio tracks\n' % ( common.formatTime(ittoc.duration() / 1000.0), ittoc.getAudioTracks())) @@ -395,7 +395,7 @@ class Program: if (not release and len(deltas.keys()) > 1): self._stdout.write('\n') self._stdout.write('Picked closest match in duration.\n') - self._stdout.write('Others may be wrong in musicbrainz, ' + self._stdout.write('Others may be wrong in MusicBrainz, ' 'please correct.\n') self._stdout.write('Artist : %s\n' % artist.encode('utf-8')) diff --git a/whipper/image/table.py b/whipper/image/table.py index b9909e6..f09386e 100644 --- a/whipper/image/table.py +++ b/whipper/image/table.py @@ -477,7 +477,7 @@ class Table(object): pass - logger.debug('Musicbrainz values: %r', result) + logger.debug('MusicBrainz values: %r', result) return result def getAccurateRipIds(self): diff --git a/whipper/test/test_image_table.py b/whipper/test/test_image_table.py index c0b0038..0b54360 100644 --- a/whipper/test/test_image_table.py +++ b/whipper/test/test_image_table.py @@ -56,7 +56,7 @@ class LadyhawkeTestCase(tcommon.TestCase): # https://musicbrainz.org/cdtoc/attach?toc=1+12+195856+150+ # 15687+31841+51016+66616+81352+99559+116070+133243+149997+161710+ # 177832&tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4- - # however, not (yet) in musicbrainz database + # however, not (yet) in MusicBrainz database self.assertEquals(self.table.getMusicBrainzDiscId(), "KnpGsLhvH.lPrNc1PBL21lb9Bg4-") diff --git a/whipper/test/test_image_toc.py b/whipper/test/test_image_toc.py index 0df4109..13bcedf 100644 --- a/whipper/test/test_image_toc.py +++ b/whipper/test/test_image_toc.py @@ -284,7 +284,7 @@ class CapitalMergeTestCase(common.TestCase): def testDuration(self): # this matches track 11 end sector - track 1 start sector on - # musicbrainz + # MusicBrainz # compare to 3rd and 4th value in URL above self.assertEquals(self.table.getFrameLength(), 173530) self.assertEquals(self.table.duration(), 2313733)