diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py index 26b7f5819..4a89e6dc8 100644 --- a/beets/autotag/hooks.py +++ b/beets/autotag/hooks.py @@ -297,7 +297,7 @@ class Distance(object): self._penalties = {} @LazyClassProperty - def _weights(cls): + def _weights(self): """A dictionary from keys to floating-point weights. """ weights_view = config['match']['distance_weights'] diff --git a/beets/dbcore/db.py b/beets/dbcore/db.py index 09a96d8c2..ba67dd6d1 100644 --- a/beets/dbcore/db.py +++ b/beets/dbcore/db.py @@ -209,13 +209,13 @@ class Model(object): # Essential field accessors. @classmethod - def _type(self, key): + def _type(cls, key): """Get the type of a field, a `Type` instance. If the field has no explicit type, it is given the base `Type`, which does no conversion. """ - return self._fields.get(key) or self._types.get(key) or types.DEFAULT + return cls._fields.get(key) or cls._types.get(key) or types.DEFAULT def __getitem__(self, key): """Get the value for a field. Raise a KeyError if the field is @@ -274,11 +274,11 @@ class Model(object): return base_keys @classmethod - def all_keys(self): + def all_keys(cls): """Get a list of available keys for objects of this type. Includes fixed and computed fields. """ - return list(self._fields) + self._getters().keys() + return list(cls._fields) + cls._getters().keys() # Act like a dictionary. diff --git a/beets/dbcore/query.py b/beets/dbcore/query.py index 8e3b7ca16..ed20d320d 100644 --- a/beets/dbcore/query.py +++ b/beets/dbcore/query.py @@ -146,9 +146,9 @@ class NoneQuery(FieldQuery): return self.field + " IS NULL", () @classmethod - def match(self, item): + def match(cls, item): try: - return item[self.field] is None + return item[cls.field] is None except KeyError: return True @@ -841,8 +841,8 @@ class SlowFieldSort(FieldSort): class NullSort(Sort): """No sorting. Leave results unsorted.""" - def sort(items): - return items + def sort(self): + return self def __nonzero__(self): return self.__bool__() diff --git a/beets/logging.py b/beets/logging.py index e4e628d69..a94da1c62 100644 --- a/beets/logging.py +++ b/beets/logging.py @@ -126,7 +126,7 @@ my_manager = copy(Logger.manager) my_manager.loggerClass = BeetsLogger -def getLogger(name=None): +def getLogger(name=None): # noqa if name: return my_manager.getLogger(name) else: diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py index 9d2ee5952..e94f8c380 100644 --- a/beets/util/artresizer.py +++ b/beets/util/artresizer.py @@ -149,15 +149,15 @@ class Shareable(type): lazily-created shared instance of ``MyClass`` while calling ``MyClass()`` to construct a new object works as usual. """ - def __init__(cls, name, bases, dict): - super(Shareable, cls).__init__(name, bases, dict) - cls._instance = None + def __init__(self, name, bases, dict): + super(Shareable, self).__init__(name, bases, dict) + self._instance = None @property - def shared(cls): - if cls._instance is None: - cls._instance = cls() - return cls._instance + def shared(self): + if self._instance is None: + self._instance = self() + return self._instance class ArtResizer(object): @@ -218,18 +218,18 @@ class ArtResizer(object): @staticmethod def _check_method(): """Return a tuple indicating an available method and its version.""" - version = has_IM() + version = get_image_magick_version() if version: return IMAGEMAGICK, version - version = has_PIL() + version = get_pil_version() if version: return PIL, version return WEBPROXY, (0) -def has_IM(): +def get_image_magick_version(): """Return Image Magick version or None if it is unavailable Try invoking ImageMagick's "convert".""" try: @@ -248,7 +248,7 @@ def has_IM(): return None -def has_PIL(): +def get_pil_version(): """Return Image Magick version or None if it is unavailable Try importing PIL.""" try: diff --git a/beetsplug/bucket.py b/beetsplug/bucket.py index cfd4106d4..21acb1f1e 100644 --- a/beetsplug/bucket.py +++ b/beetsplug/bucket.py @@ -26,6 +26,9 @@ from itertools import tee, izip from beets import plugins, ui +ASCII_DIGITS = string.digits + string.ascii_lowercase + + class BucketError(Exception): pass @@ -155,23 +158,23 @@ def build_alpha_spans(alpha_spans_str, alpha_regexs): [from...to] """ spans = [] - ASCII_DIGITS = string.digits + string.ascii_lowercase + for elem in alpha_spans_str: if elem in alpha_regexs: spans.append(re.compile(alpha_regexs[elem])) else: bucket = sorted([x for x in elem.lower() if x.isalnum()]) if bucket: - beginIdx = ASCII_DIGITS.index(bucket[0]) - endIdx = ASCII_DIGITS.index(bucket[-1]) + begin_index = ASCII_DIGITS.index(bucket[0]) + end_index = ASCII_DIGITS.index(bucket[-1]) else: raise ui.UserError(u"invalid range defined for alpha bucket " u"'%s': no alphanumeric character found" % elem) spans.append( re.compile( - "^[" + ASCII_DIGITS[beginIdx:endIdx + 1] + - ASCII_DIGITS[beginIdx:endIdx + 1].upper() + "]" + "^[" + ASCII_DIGITS[begin_index:end_index + 1] + + ASCII_DIGITS[begin_index:end_index + 1].upper() + "]" ) ) return spans diff --git a/beetsplug/export.py b/beetsplug/export.py index 93362550f..641b9fefc 100644 --- a/beetsplug/export.py +++ b/beetsplug/export.py @@ -119,7 +119,7 @@ class ExportFormat(object): """The output format type""" @classmethod - def factory(self, type, **kwargs): + def factory(cls, type, **kwargs): if type == "json": if kwargs['file_path']: return JsonFileFormat(**kwargs) diff --git a/beetsplug/fuzzy.py b/beetsplug/fuzzy.py index 4a631a887..3decdc602 100644 --- a/beetsplug/fuzzy.py +++ b/beetsplug/fuzzy.py @@ -26,13 +26,13 @@ import difflib class FuzzyQuery(StringFieldQuery): @classmethod - def string_match(self, pattern, val): + def string_match(cls, pattern, val): # smartcase if pattern.islower(): val = val.lower() - queryMatcher = difflib.SequenceMatcher(None, pattern, val) + query_matcher = difflib.SequenceMatcher(None, pattern, val) threshold = config['fuzzy']['threshold'].as_number() - return queryMatcher.quick_ratio() >= threshold + return query_matcher.quick_ratio() >= threshold class FuzzyPlugin(BeetsPlugin): diff --git a/test/_common.py b/test/_common.py index c64ff0b71..33928fb66 100644 --- a/test/_common.py +++ b/test/_common.py @@ -167,11 +167,11 @@ class TestCase(unittest.TestCase): beets.config.clear() beets.config._materialized = False - def assertExists(self, path): + def assertExists(self, path): # noqa self.assertTrue(os.path.exists(path), u'file does not exist: {!r}'.format(path)) - def assertNotExists(self, path): + def assertNotExists(self, path): # noqa self.assertFalse(os.path.exists(path), u'file exists: {!r}'.format((path))) diff --git a/test/test_art.py b/test/test_art.py index 3014707a8..44b3b9bd4 100644 --- a/test/test_art.py +++ b/test/test_art.py @@ -518,7 +518,7 @@ class ArtForAlbumTest(UseThePlugin): fetchart.FileSystem.get = self.old_fs_source_get super(ArtForAlbumTest, self).tearDown() - def _assertImageIsValidArt(self, image_file, should_exist): + def _assertImageIsValidArt(self, image_file, should_exist): # noqa self.assertExists(image_file) self.image_file = image_file @@ -531,7 +531,7 @@ class ArtForAlbumTest(UseThePlugin): else: self.assertIsNone(candidate) - def _assertImageResized(self, image_file, should_resize): + def _assertImageResized(self, image_file, should_resize): # noqa self.image_file = image_file with patch.object(ArtResizer.shared, 'resize') as mock_resize: self.plugin.art_for_album(self.album, [''], True) diff --git a/test/test_autotag.py b/test/test_autotag.py index 30d60f8c4..bdc3ee2d4 100644 --- a/test/test_autotag.py +++ b/test/test_autotag.py @@ -940,13 +940,13 @@ class EnumTest(_common.TestCase): Test Enum Subclasses defined in beets.util.enumeration """ def test_ordered_enum(self): - OrderedEnumTest = match.OrderedEnum('OrderedEnumTest', ['a', 'b', 'c']) - self.assertLess(OrderedEnumTest.a, OrderedEnumTest.b) - self.assertLess(OrderedEnumTest.a, OrderedEnumTest.c) - self.assertLess(OrderedEnumTest.b, OrderedEnumTest.c) - self.assertGreater(OrderedEnumTest.b, OrderedEnumTest.a) - self.assertGreater(OrderedEnumTest.c, OrderedEnumTest.a) - self.assertGreater(OrderedEnumTest.c, OrderedEnumTest.b) + ordered_enum = match.OrderedEnum('OrderedEnumTest', ['a', 'b', 'c']) + self.assertLess(ordered_enum.a, ordered_enum.b) + self.assertLess(ordered_enum.a, ordered_enum.c) + self.assertLess(ordered_enum.b, ordered_enum.c) + self.assertGreater(ordered_enum.b, ordered_enum.a) + self.assertGreater(ordered_enum.c, ordered_enum.a) + self.assertGreater(ordered_enum.c, ordered_enum.b) def suite(): diff --git a/test/test_convert.py b/test/test_convert.py index 20ed6c743..679b70a4f 100644 --- a/test/test_convert.py +++ b/test/test_convert.py @@ -40,7 +40,7 @@ class TestHelper(helper.TestHelper): return u'sh -c "cp \'$source\' \'$dest\'; ' \ u'printf {0} >> \'$dest\'"'.format(tag) - def assertFileTag(self, path, tag): + def assertFileTag(self, path, tag): # noqa """Assert that the path is a file and the files content ends with `tag`. """ self.assertTrue(os.path.isfile(path), @@ -50,7 +50,7 @@ class TestHelper(helper.TestHelper): self.assertEqual(f.read(), tag, u'{0} is not tagged with {1}'.format(path, tag)) - def assertNoFileTag(self, path, tag): + def assertNoFileTag(self, path, tag): # noqa """Assert that the path is a file and the files content does not end with `tag`. """ diff --git a/test/test_datequery.py b/test/test_datequery.py index 6c9818b77..b978d7304 100644 --- a/test/test_datequery.py +++ b/test/test_datequery.py @@ -62,14 +62,14 @@ class DateIntervalTest(unittest.TestCase): self.assertContains('..', date=datetime.min) self.assertContains('..', '1000-01-01T00:00:00') - def assertContains(self, interval_pattern, date_pattern=None, date=None): + def assertContains(self, interval_pattern, date_pattern=None, date=None): # noqa if date is None: date = _date(date_pattern) (start, end) = _parse_periods(interval_pattern) interval = DateInterval.from_periods(start, end) self.assertTrue(interval.contains(date)) - def assertExcludes(self, interval_pattern, date_pattern): + def assertExcludes(self, interval_pattern, date_pattern): # noqa date = _date(date_pattern) (start, end) = _parse_periods(interval_pattern) interval = DateInterval.from_periods(start, end) diff --git a/test/test_edit.py b/test/test_edit.py index ab0ae046a..94bb2d937 100644 --- a/test/test_edit.py +++ b/test/test_edit.py @@ -71,7 +71,7 @@ class ModifyFileMocker(object): class EditMixin(object): """Helper containing some common functionality used for the Edit tests.""" - def assertItemFieldsModified(self, library_items, items, fields=[], + def assertItemFieldsModified(self, library_items, items, fields=[], # noqa allowed=['path']): """Assert that items in the library (`lib_items`) have different values on the specified `fields` (and *only* on those fields), compared to @@ -133,7 +133,7 @@ class EditCommandTest(unittest.TestCase, TestHelper, EditMixin): self.teardown_beets() self.unload_plugins() - def assertCounts(self, album_count=ALBUM_COUNT, track_count=TRACK_COUNT, + def assertCounts(self, album_count=ALBUM_COUNT, track_count=TRACK_COUNT, # noqa write_call_count=TRACK_COUNT, title_starts_with=''): """Several common assertions on Album, Track and call counts.""" self.assertEqual(len(self.lib.albums()), album_count) diff --git a/test/test_importadded.py b/test/test_importadded.py index 9fa30f523..6e003ed0f 100644 --- a/test/test_importadded.py +++ b/test/test_importadded.py @@ -67,7 +67,7 @@ class ImportAddedTest(unittest.TestCase, ImportHelper): self.teardown_beets() self.matcher.restore() - def findMediaFile(self, item): + def find_media_file(self, item): """Find the pre-import MediaFile for an Item""" for m in self.media_files: if m.title.replace('Tag', 'Applied') == item.title: @@ -75,11 +75,11 @@ class ImportAddedTest(unittest.TestCase, ImportHelper): raise AssertionError(u"No MediaFile found for Item " + util.displayable_path(item.path)) - def assertEqualTimes(self, first, second, msg=None): + def assertEqualTimes(self, first, second, msg=None): # noqa """For comparing file modification times at a sufficient precision""" self.assertAlmostEqual(first, second, places=4, msg=msg) - def assertAlbumImport(self): + def assertAlbumImport(self): # noqa self.importer.run() album = self.lib.albums().get() self.assertEqual(album.added, self.min_mtime) @@ -102,7 +102,7 @@ class ImportAddedTest(unittest.TestCase, ImportHelper): self.assertEqual(album.added, self.min_mtime) for item in album.items(): self.assertEqualTimes(item.added, self.min_mtime) - mediafile_mtime = os.path.getmtime(self.findMediaFile(item).path) + mediafile_mtime = os.path.getmtime(self.find_media_file(item).path) self.assertEqualTimes(item.mtime, mediafile_mtime) self.assertEqualTimes(os.path.getmtime(item.path), mediafile_mtime) @@ -133,7 +133,7 @@ class ImportAddedTest(unittest.TestCase, ImportHelper): self.config['import']['singletons'] = True self.importer.run() for item in self.lib.items(): - mfile = self.findMediaFile(item) + mfile = self.find_media_file(item) self.assertEqualTimes(item.added, os.path.getmtime(mfile.path)) def test_import_singletons_with_preserved_mtimes(self): @@ -141,7 +141,7 @@ class ImportAddedTest(unittest.TestCase, ImportHelper): self.config['importadded']['preserve_mtimes'] = True self.importer.run() for item in self.lib.items(): - mediafile_mtime = os.path.getmtime(self.findMediaFile(item).path) + mediafile_mtime = os.path.getmtime(self.find_media_file(item).path) self.assertEqualTimes(item.added, mediafile_mtime) self.assertEqualTimes(item.mtime, mediafile_mtime) self.assertEqualTimes(os.path.getmtime(item.path), diff --git a/test/test_importer.py b/test/test_importer.py index d1ef6ef18..ff2020ef8 100644 --- a/test/test_importer.py +++ b/test/test_importer.py @@ -125,14 +125,14 @@ class AutotagStub(object): artist = artist.replace('Tag', 'Applied') + id album = album.replace('Tag', 'Applied') + id - trackInfos = [] + track_infos = [] for i in range(tracks - missing): - trackInfos.append(self._make_track_match(artist, album, i + 1)) + track_infos.append(self._make_track_match(artist, album, i + 1)) return AlbumInfo( artist=artist, album=album, - tracks=trackInfos, + tracks=track_infos, va=False, album_id=u'albumid' + id, artist_id=u'artistid' + id, diff --git a/test/test_lastgenre.py b/test/test_lastgenre.py index 82396f7c7..b397d2c21 100644 --- a/test/test_lastgenre.py +++ b/test/test_lastgenre.py @@ -167,16 +167,16 @@ class LastGenrePluginTest(unittest.TestCase, TestHelper): self.assertEqual(res, [u'pop']) def test_get_genre(self): - MOCK_GENRES = {'track': u'1', 'album': u'2', 'artist': u'3'} + mock_genres = {'track': u'1', 'album': u'2', 'artist': u'3'} def mock_fetch_track_genre(self, obj=None): - return MOCK_GENRES['track'] + return mock_genres['track'] def mock_fetch_album_genre(self, obj): - return MOCK_GENRES['album'] + return mock_genres['album'] def mock_fetch_artist_genre(self, obj): - return MOCK_GENRES['artist'] + return mock_genres['artist'] lastgenre.LastGenrePlugin.fetch_track_genre = mock_fetch_track_genre lastgenre.LastGenrePlugin.fetch_album_genre = mock_fetch_album_genre @@ -184,7 +184,7 @@ class LastGenrePluginTest(unittest.TestCase, TestHelper): self._setup_config(whitelist=False) item = _common.item() - item.genre = MOCK_GENRES['track'] + item.genre = mock_genres['track'] config['lastgenre'] = {'force': False} res = self.plugin._get_genre(item) @@ -192,17 +192,17 @@ class LastGenrePluginTest(unittest.TestCase, TestHelper): config['lastgenre'] = {'force': True, 'source': u'track'} res = self.plugin._get_genre(item) - self.assertEqual(res, (MOCK_GENRES['track'], u'track')) + self.assertEqual(res, (mock_genres['track'], u'track')) config['lastgenre'] = {'source': u'album'} res = self.plugin._get_genre(item) - self.assertEqual(res, (MOCK_GENRES['album'], u'album')) + self.assertEqual(res, (mock_genres['album'], u'album')) config['lastgenre'] = {'source': u'artist'} res = self.plugin._get_genre(item) - self.assertEqual(res, (MOCK_GENRES['artist'], u'artist')) + self.assertEqual(res, (mock_genres['artist'], u'artist')) - MOCK_GENRES['artist'] = None + mock_genres['artist'] = None res = self.plugin._get_genre(item) self.assertEqual(res, (item.genre, u'original')) diff --git a/test/test_lyrics.py b/test/test_lyrics.py index 2658232ae..13bffacdb 100644 --- a/test/test_lyrics.py +++ b/test/test_lyrics.py @@ -365,14 +365,14 @@ class LyricsGooglePluginTest(unittest.TestCase): not present in the title.""" s = self.source url = s['url'] + s['path'] - urlTitle = u'example.com | Beats song by John doe' + url_title = u'example.com | Beats song by John doe' # very small diffs (typo) are ok eg 'beats' vs 'beets' with same artist - self.assertEqual(google.is_page_candidate(url, urlTitle, s['title'], + self.assertEqual(google.is_page_candidate(url, url_title, s['title'], s['artist']), True, url) # reject different title - urlTitle = u'example.com | seets bong lyrics by John doe' - self.assertEqual(google.is_page_candidate(url, urlTitle, s['title'], + url_title = u'example.com | seets bong lyrics by John doe' + self.assertEqual(google.is_page_candidate(url, url_title, s['title'], s['artist']), False, url) def test_is_page_candidate_special_chars(self): diff --git a/test/test_mediafile.py b/test/test_mediafile.py index 71fd796bd..ad83573da 100644 --- a/test/test_mediafile.py +++ b/test/test_mediafile.py @@ -168,7 +168,7 @@ class ImageStructureTestMixin(ArtTestMixin): self.assertEqual(cover.desc, u'album cover') self.assertEqual(mediafile.art, cover.data) - def assertExtendedImageAttributes(self, image, **kwargs): + def assertExtendedImageAttributes(self, image, **kwargs): # noqa """Ignore extended image attributes in the base tests. """ pass @@ -177,7 +177,7 @@ class ImageStructureTestMixin(ArtTestMixin): class ExtendedImageStructureTestMixin(ImageStructureTestMixin): """Checks for additional attributes in the image structure.""" - def assertExtendedImageAttributes(self, image, desc=None, type=None): + def assertExtendedImageAttributes(self, image, desc=None, type=None): # noqa self.assertEqual(image.desc, desc) self.assertEqual(image.type, type) @@ -660,7 +660,7 @@ class ReadWriteTestBase(ArtTestMixin, GenreListTestMixin, self.assertIsNone(mediafile.date) self.assertIsNone(mediafile.year) - def assertTags(self, mediafile, tags): + def assertTags(self, mediafile, tags): # noqa errors = [] for key, value in tags.items(): try: diff --git a/test/test_mpdstats.py b/test/test_mpdstats.py index 0fa800dfd..4ad9d00c4 100644 --- a/test/test_mpdstats.py +++ b/test/test_mpdstats.py @@ -43,14 +43,14 @@ class MPDStatsTest(unittest.TestCase, TestHelper): self.assertFalse(mpdstats.update_rating(None, True)) def test_get_item(self): - ITEM_PATH = '/foo/bar.flac' - item = Item(title=u'title', path=ITEM_PATH, id=1) + item_path = '/foo/bar.flac' + item = Item(title=u'title', path=item_path, id=1) item.add(self.lib) log = Mock() mpdstats = MPDStats(self.lib, log) - self.assertEqual(str(mpdstats.get_item(ITEM_PATH)), str(item)) + self.assertEqual(str(mpdstats.get_item(item_path)), str(item)) self.assertIsNone(mpdstats.get_item('/some/non-existing/path')) self.assertIn(u'item not found:', log.info.call_args[0][0]) @@ -60,13 +60,13 @@ class MPDStatsTest(unittest.TestCase, TestHelper): {'state': u'play', 'songid': 1, 'time': u'0:1'}, {'state': u'stop'}] EVENTS = [["player"]] * (len(STATUSES) - 1) + [KeyboardInterrupt] - ITEM_PATH = '/foo/bar.flac' + item_path = '/foo/bar.flac' @patch("beetsplug.mpdstats.MPDClientWrapper", return_value=Mock(**{ "events.side_effect": EVENTS, "status.side_effect": STATUSES, - "playlist.return_value": {1: ITEM_PATH}})) - def test_run_MPDStats(self, mpd_mock): - item = Item(title=u'title', path=self.ITEM_PATH, id=1) + "playlist.return_value": {1: item_path}})) + def test_run_mpdstats(self, mpd_mock): + item = Item(title=u'title', path=self.item_path, id=1) item.add(self.lib) log = Mock() diff --git a/test/test_permissions.py b/test/test_permissions.py index 6dcf4d01c..a1b7ddd19 100644 --- a/test/test_permissions.py +++ b/test/test_permissions.py @@ -38,7 +38,7 @@ class PermissionsPluginTest(unittest.TestCase, TestHelper): def test_failing_to_set_permissions(self): self.do_thing(False) - def do_thing(self, expectSuccess): + def do_thing(self, expect_success): def get_stat(v): return os.stat( os.path.join(self.temp_dir, 'import', *v)).st_mode & 0o777 @@ -53,14 +53,14 @@ class PermissionsPluginTest(unittest.TestCase, TestHelper): self.importer.run() item = self.lib.items().get() - self.assertPerms(item.path, 'file', expectSuccess) + self.assertPerms(item.path, 'file', expect_success) for path in dirs_in_library(self.lib.directory, item.path): - self.assertPerms(path, 'dir', expectSuccess) + self.assertPerms(path, 'dir', expect_success) - def assertPerms(self, path, typ, expectSuccess): - for x in [(True, self.exp_perms[expectSuccess][typ], '!='), - (False, self.exp_perms[not expectSuccess][typ], '==')]: + def assertPerms(self, path, typ, expect_success): # noqa + for x in [(True, self.exp_perms[expect_success][typ], '!='), + (False, self.exp_perms[not expect_success][typ], '==')]: self.assertEqual(x[0], check_permissions(path, x[1]), msg=u'{} : {} {} {}'.format( path, oct(os.stat(path).st_mode), x[2], oct(x[1]))) diff --git a/test/test_query.py b/test/test_query.py index 7dd659313..5fb717c9c 100644 --- a/test/test_query.py +++ b/test/test_query.py @@ -35,11 +35,11 @@ from beets.library import Library, Item class TestHelper(helper.TestHelper): - def assertInResult(self, item, results): + def assertInResult(self, item, results): # noqa result_ids = map(lambda i: i.id, results) self.assertIn(item.id, result_ids) - def assertNotInResult(self, item, results): + def assertNotInResult(self, item, results): # noqa result_ids = map(lambda i: i.id, results) self.assertNotIn(item.id, result_ids) @@ -805,7 +805,7 @@ class NotQueryTest(DummyDataTestCase): - `test_type_xxx`: tests for the negation of a particular XxxQuery class. - `test_get_yyy`: tests on query strings (similar to `GetTest`) """ - def assertNegationProperties(self, q): + def assertNegationProperties(self, q): # noqa """Given a Query `q`, assert that: - q OR not(q) == all items - q AND not(q) == 0 diff --git a/test/test_smartplaylist.py b/test/test_smartplaylist.py index c30ba24d0..25f6727f0 100644 --- a/test/test_smartplaylist.py +++ b/test/test_smartplaylist.py @@ -88,15 +88,15 @@ class SmartPlaylistTest(unittest.TestCase): for name, (_, sort), _ in spl._unmatched_playlists) asseq = self.assertEqual # less cluttered code - S = FixedFieldSort # short cut since we're only dealing with this + sort = FixedFieldSort # short cut since we're only dealing with this asseq(sorts["no_sort"], NullSort()) - asseq(sorts["one_sort"], S(u'year')) + asseq(sorts["one_sort"], sort(u'year')) asseq(sorts["only_empty_sorts"], None) - asseq(sorts["one_non_empty_sort"], S(u'year')) + asseq(sorts["one_non_empty_sort"], sort(u'year')) asseq(sorts["multiple_sorts"], - MultipleSort([S('year'), S(u'genre', False)])) + MultipleSort([sort('year'), sort(u'genre', False)])) asseq(sorts["mixed"], - MultipleSort([S('year'), S(u'genre'), S(u'id', False)])) + MultipleSort([sort('year'), sort(u'genre'), sort(u'id', False)])) def test_matches(self): spl = SmartPlaylistPlugin() diff --git a/test/test_ui.py b/test/test_ui.py index fdc16aff9..4de5e9ed5 100644 --- a/test/test_ui.py +++ b/test/test_ui.py @@ -233,18 +233,18 @@ class ModifyTest(unittest.TestCase, TestHelper): def test_selective_modify(self): title = u"Tracktitle" album = u"album" - origArtist = u"composer" - newArtist = u"coverArtist" + original_artist = u"composer" + new_artist = u"coverArtist" for i in range(0, 10): self.add_item_fixture(title=u"{0}{1}".format(title, i), - artist=origArtist, + artist=original_artist, album=album) self.modify_inp('s\ny\ny\ny\nn\nn\ny\ny\ny\ny\nn', - title, u"artist={0}".format(newArtist)) - origItems = self.lib.items(u"artist:{0}".format(origArtist)) - newItems = self.lib.items(u"artist:{0}".format(newArtist)) - self.assertEqual(len(list(origItems)), 3) - self.assertEqual(len(list(newItems)), 7) + title, u"artist={0}".format(new_artist)) + original_items = self.lib.items(u"artist:{0}".format(original_artist)) + new_items = self.lib.items(u"artist:{0}".format(new_artist)) + self.assertEqual(len(list(original_items)), 3) + self.assertEqual(len(list(new_items)), 7) # Album Tests