From bd81f80afaeb441191135199cc5b58fb2ba705dc Mon Sep 17 00:00:00 2001 From: JoeLametta Date: Wed, 2 May 2018 08:55:00 +0000 Subject: [PATCH] Make flake8 happy --- whipper/test/test_common_common.py | 8 ++-- whipper/test/test_common_config.py | 8 ++-- whipper/test/test_common_mbngs.py | 61 +++++++++++++---------------- whipper/test/test_common_path.py | 4 +- whipper/test/test_common_program.py | 10 ++--- whipper/test/test_image_table.py | 6 +-- whipper/test/test_image_toc.py | 10 ++--- 7 files changed, 50 insertions(+), 57 deletions(-) diff --git a/whipper/test/test_common_common.py b/whipper/test/test_common_common.py index 3ac8fea..a6f6e57 100644 --- a/whipper/test/test_common_common.py +++ b/whipper/test/test_common_common.py @@ -46,7 +46,7 @@ class GetRelativePathTestCase(tcommon.TestCase): track = './' + directory + '/01. Placebo - Taste in Men.flac' self.assertEqual(common.getRelativePath(track, cue), - '01. Placebo - Taste in Men.flac') + '01. Placebo - Taste in Men.flac') class GetRealPathTestCase(tcommon.TestCase): @@ -55,13 +55,11 @@ class GetRealPathTestCase(tcommon.TestCase): fd, path = tempfile.mkstemp(suffix=u'back\\slash.flac') refPath = os.path.join(os.path.dirname(path), 'fake.cue') - self.assertEqual(common.getRealPath(refPath, path), - path) + self.assertEqual(common.getRealPath(refPath, path), path) # same path, but with wav extension, will point to flac file wavPath = path[:-4] + 'wav' - self.assertEqual(common.getRealPath(refPath, wavPath), - path) + self.assertEqual(common.getRealPath(refPath, wavPath), path) os.close(fd) os.unlink(path) diff --git a/whipper/test/test_common_config.py b/whipper/test/test_common_config.py index e9d9a31..0653aad 100644 --- a/whipper/test/test_common_config.py +++ b/whipper/test/test_common_config.py @@ -69,8 +69,8 @@ class ConfigTestCase(tcommon.TestCase): def test_get_musicbrainz_server(self): self.assertEqual(self._config.get_musicbrainz_server(), - 'musicbrainz.org', - msg='Default value is correct') + 'musicbrainz.org', + msg='Default value is correct') self._config._parser.add_section('musicbrainz') @@ -78,8 +78,8 @@ class ConfigTestCase(tcommon.TestCase): '192.168.2.141:5000') self._config.write() self.assertEqual(self._config.get_musicbrainz_server(), - '192.168.2.141:5000', - msg='Correctly returns user-set value') + '192.168.2.141:5000', + msg='Correctly returns user-set value') self._config._parser.set('musicbrainz', 'server', '192.168.2.141:5000/hello/world') diff --git a/whipper/test/test_common_mbngs.py b/whipper/test/test_common_mbngs.py index 10beaed..8ca401c 100644 --- a/whipper/test/test_common_mbngs.py +++ b/whipper/test/test_common_mbngs.py @@ -38,7 +38,7 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(metadata.artist, u'Various Artists') self.assertEqual(metadata.release, u'2001-10-15') self.assertEqual(metadata.mbidArtist, - u'89ad4ac3-39f7-470e-963a-56509c546377') + u'89ad4ac3-39f7-470e-963a-56509c546377') self.assertEqual(len(metadata.tracks), 18) @@ -46,11 +46,10 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(track16.artist, 'Tom Jones & Stereophonics') self.assertEqual(track16.mbidArtist, - u'57c6f649-6cde-48a7-8114-2a200247601a' - ';0bfba3d3-6a04-4779-bb0a-df07df5b0558' - ) + u'57c6f649-6cde-48a7-8114-2a200247601a' + ';0bfba3d3-6a04-4779-bb0a-df07df5b0558') self.assertEqual(track16.sortName, - u'Jones, Tom & Stereophonics') + u'Jones, Tom & Stereophonics') def testBalladOfTheBrokenSeas(self): # various artists disc @@ -65,11 +64,11 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(metadata.artist, u'Isobel Campbell & Mark Lanegan') self.assertEqual(metadata.sortName, - u'Campbell, Isobel & Lanegan, Mark') + u'Campbell, Isobel & Lanegan, Mark') self.assertEqual(metadata.release, u'2006-01-30') self.assertEqual(metadata.mbidArtist, - u'd51f3a15-12a2-41a0-acfa-33b5eae71164;' - 'a9126556-f555-4920-9617-6e013f8228a7') + u'd51f3a15-12a2-41a0-acfa-33b5eae71164;' + 'a9126556-f555-4920-9617-6e013f8228a7') self.assertEqual(len(metadata.tracks), 12) @@ -77,12 +76,11 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(track12.artist, u'Isobel Campbell & Mark Lanegan') self.assertEqual(track12.sortName, - u'Campbell, Isobel' - ' & Lanegan, Mark' - ) + u'Campbell, Isobel' + ' & Lanegan, Mark') self.assertEqual(track12.mbidArtist, - u'd51f3a15-12a2-41a0-acfa-33b5eae71164;' - 'a9126556-f555-4920-9617-6e013f8228a7') + u'd51f3a15-12a2-41a0-acfa-33b5eae71164;' + 'a9126556-f555-4920-9617-6e013f8228a7') def testMalaInCuba(self): # single artist disc, but with multiple artists tracks @@ -100,7 +98,7 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(metadata.sortName, u'Mala') self.assertEqual(metadata.release, u'2012-09-17') self.assertEqual(metadata.mbidArtist, - u'09f221eb-c97e-4da5-ac22-d7ab7c555bbb') + u'09f221eb-c97e-4da5-ac22-d7ab7c555bbb') self.assertEqual(len(metadata.tracks), 14) @@ -108,12 +106,11 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(track6.artist, u'Mala feat. Dreiser & Sexto Sentido') self.assertEqual(track6.sortName, - u'Mala feat. Dreiser & Sexto Sentido') + u'Mala feat. Dreiser & Sexto Sentido') self.assertEqual(track6.mbidArtist, - u'09f221eb-c97e-4da5-ac22-d7ab7c555bbb' - ';ec07a209-55ff-4084-bc41-9d4d1764e075' - ';f626b92e-07b1-4a19-ad13-c09d690db66c' - ) + u'09f221eb-c97e-4da5-ac22-d7ab7c555bbb' + ';ec07a209-55ff-4084-bc41-9d4d1764e075' + ';f626b92e-07b1-4a19-ad13-c09d690db66c') def testNorthernGateway(self): """ @@ -133,7 +130,7 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(metadata.artist, u'Various Artists') self.assertEqual(metadata.release, u'2010') self.assertEqual(metadata.mbidArtist, - u'89ad4ac3-39f7-470e-963a-56509c546377') + u'89ad4ac3-39f7-470e-963a-56509c546377') self.assertEqual(len(metadata.tracks), 10) @@ -141,20 +138,18 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(track2.artist, u'Twisted Reaction feat. Danielle') self.assertEqual(track2.sortName, - u'Twisted Reaction feat. [unknown]') + u'Twisted Reaction feat. [unknown]') self.assertEqual(track2.mbidArtist, - u'4f69f624-73ea-4a16-b822-bd2ca58032bf' - ';125ec42a-7229-4250-afc5-e057484327fe' - ) + u'4f69f624-73ea-4a16-b822-bd2ca58032bf' + ';125ec42a-7229-4250-afc5-e057484327fe') track4 = metadata.tracks[3] self.assertEqual(track4.artist, u'BioGenesis') self.assertEqual(track4.sortName, - u'Bio Genesis') + u'Bio Genesis') self.assertEqual(track4.mbidArtist, - u'dd61b86c-c015-43e1-9a28-58fceb0975c8' - ) + u'dd61b86c-c015-43e1-9a28-58fceb0975c8') def testNenaAndKimWildSingle(self): """ @@ -172,8 +167,8 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(metadata.artist, u'Nena & Kim Wilde') self.assertEqual(metadata.release, u'2003-05-19') self.assertEqual(metadata.mbidArtist, - u'38bfaa7f-ee98-48cb-acd0-946d7aeecd76' - ';4b462375-c508-432a-8c88-ceeec38b16ae') + u'38bfaa7f-ee98-48cb-acd0-946d7aeecd76' + ';4b462375-c508-432a-8c88-ceeec38b16ae') self.assertEqual(len(metadata.tracks), 4) @@ -182,13 +177,13 @@ class MetadataTestCase(unittest.TestCase): self.assertEqual(track1.artist, u'Nena & Kim Wilde') self.assertEqual(track1.sortName, u'Nena & Wilde, Kim') self.assertEqual(track1.mbidArtist, - u'38bfaa7f-ee98-48cb-acd0-946d7aeecd76' - ';4b462375-c508-432a-8c88-ceeec38b16ae') + u'38bfaa7f-ee98-48cb-acd0-946d7aeecd76' + ';4b462375-c508-432a-8c88-ceeec38b16ae') track2 = metadata.tracks[1] self.assertEqual(track2.artist, u'Nena & Kim Wilde') self.assertEqual(track2.sortName, u'Nena & Wilde, Kim') self.assertEqual(track2.mbidArtist, - u'38bfaa7f-ee98-48cb-acd0-946d7aeecd76' - ';4b462375-c508-432a-8c88-ceeec38b16ae') + u'38bfaa7f-ee98-48cb-acd0-946d7aeecd76' + ';4b462375-c508-432a-8c88-ceeec38b16ae') diff --git a/whipper/test/test_common_path.py b/whipper/test/test_common_path.py index a62a7f3..41b7cbe 100644 --- a/whipper/test/test_common_path.py +++ b/whipper/test/test_common_path.py @@ -22,9 +22,9 @@ class FilterTestCase(common.TestCase): def testSpecial(self): part = u'<<< $&*!\' "()`{}[]spaceship>>>' self.assertEqual(self._filter.filter(part), - u'___ _____ ________spaceship___') + u'___ _____ ________spaceship___') def testGreatest(self): part = u'Greatest Ever! Soul: The Definitive Collection' self.assertEqual(self._filter.filter(part), - u'Greatest Ever_ Soul - The Definitive Collection') + u'Greatest Ever_ Soul - The Definitive Collection') diff --git a/whipper/test/test_common_program.py b/whipper/test/test_common_program.py index 895497f..ef7ca0b 100644 --- a/whipper/test/test_common_program.py +++ b/whipper/test/test_common_program.py @@ -16,8 +16,8 @@ class PathTestCase(unittest.TestCase): path = prog.getPath(u'/tmp', DEFAULT_DISC_TEMPLATE, 'mbdiscid', None) self.assertEqual(path, - unicode('/tmp/unknown/Unknown Artist - mbdiscid/' - 'Unknown Artist - mbdiscid')) + unicode('/tmp/unknown/Unknown Artist - mbdiscid/' + 'Unknown Artist - mbdiscid')) def testStandardTemplateFilled(self): prog = program.Program(config.Config()) @@ -28,8 +28,8 @@ class PathTestCase(unittest.TestCase): path = prog.getPath(u'/tmp', DEFAULT_DISC_TEMPLATE, 'mbdiscid', md, 0) self.assertEqual(path, - unicode('/tmp/unknown/Jeff Buckley - Grace/' - 'Jeff Buckley - Grace')) + unicode('/tmp/unknown/Jeff Buckley - Grace/' + 'Jeff Buckley - Grace')) def testIssue66TemplateFilled(self): prog = program.Program(config.Config()) @@ -39,4 +39,4 @@ class PathTestCase(unittest.TestCase): path = prog.getPath(u'/tmp', u'%A/%d', 'mbdiscid', md, 0) self.assertEqual(path, - u'/tmp/Jeff Buckley/Grace') + u'/tmp/Jeff Buckley/Grace') diff --git a/whipper/test/test_image_table.py b/whipper/test/test_image_table.py index 53a6760..e6c559e 100644 --- a/whipper/test/test_image_table.py +++ b/whipper/test/test_image_table.py @@ -59,13 +59,13 @@ class LadyhawkeTestCase(tcommon.TestCase): # however, not (yet) in MusicBrainz database self.assertEqual(self.table.getMusicBrainzDiscId(), - "KnpGsLhvH.lPrNc1PBL21lb9Bg4-") + "KnpGsLhvH.lPrNc1PBL21lb9Bg4-") def testAccurateRip(self): self.assertEqual(self.table.accuraterip_ids(), ( "0013bd5a", "00b8d489")) self.assertEqual(self.table.accuraterip_path(), - "a/5/d/dBAR-012-0013bd5a-00b8d489-c60af50d.bin") + "a/5/d/dBAR-012-0013bd5a-00b8d489-c60af50d.bin") def testDuration(self): self.assertEqual(self.table.duration(), 2761413) @@ -94,7 +94,7 @@ class MusicBrainzTestCase(tcommon.TestCase): def testMusicBrainz(self): self.assertEqual(self.table.getMusicBrainzDiscId(), - '49HHV7Eb8UKF3aQiNmu1GR8vKTY-') + '49HHV7Eb8UKF3aQiNmu1GR8vKTY-') class PregapTestCase(tcommon.TestCase): diff --git a/whipper/test/test_image_toc.py b/whipper/test/test_image_toc.py index 3224470..e7c5596 100644 --- a/whipper/test/test_image_toc.py +++ b/whipper/test/test_image_toc.py @@ -25,7 +25,7 @@ class CureTestCase(common.TestCase): # its length is all of track 1 from .toc, plus the INDEX 00 length # of track 2 self.assertEqual(self.toc.getTrackLength(t), - (((6 * 60) + 16) * 75 + 45) + ((1 * 75) + 4)) + (((6 * 60) + 16) * 75 + 45) + ((1 * 75) + 4)) # last track has unknown length t = self.toc.table.tracks[-1] self.assertEqual(self.toc.getTrackLength(t), -1) @@ -90,7 +90,7 @@ class CureTestCase(common.TestCase): # we verify it because it has failed in readdisc in the past self.assertEqual(self.toc.table.accuraterip_path(), - '3/c/4/dBAR-013-0019d4c3-00fe8924-b90c650d.bin') + '3/c/4/dBAR-013-0019d4c3-00fe8924-b90c650d.bin') def testGetRealPath(self): self.assertRaises(KeyError, self.toc.getRealPath, u'track01.wav') @@ -165,7 +165,7 @@ class BlocTestCase(common.TestCase): def testAccurateRip(self): # we verify it because it has failed in readdisc in the past self.assertEqual(self.toc.table.accuraterip_path(), - 'e/d/2/dBAR-013-001af2de-0105994e-ad0be00d.bin') + 'e/d/2/dBAR-013-001af2de-0105994e-ad0be00d.bin') # The Breeders - Mountain Battles has CDText @@ -214,7 +214,7 @@ class LadyhawkeTestCase(common.TestCase): def testMusicBrainz(self): self.assertEqual(self.toc.table.getMusicBrainzDiscId(), - "KnpGsLhvH.lPrNc1PBL21lb9Bg4-") + "KnpGsLhvH.lPrNc1PBL21lb9Bg4-") self.assertEqual(self.toc.table.getMusicBrainzSubmitURL(), "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-") # noqa: E501 @@ -262,7 +262,7 @@ class CapitalMergeTestCase(common.TestCase): # 197850+24320+44855+64090+77885+88095+104020+118245+129255+141765+ # 164487+181780&tracks=11&id=MAj3xXf6QMy7G.BIFOyHyq4MySE- self.assertEqual(self.table.getMusicBrainzDiscId(), - "MAj3xXf6QMy7G.BIFOyHyq4MySE-") + "MAj3xXf6QMy7G.BIFOyHyq4MySE-") def testDuration(self): # this matches track 11 end sector - track 1 start sector on