From 8d9db9ffe6e4eebfabd1d4f338c6530770ae05ab Mon Sep 17 00:00:00 2001 From: Diego Moreda Date: Tue, 24 Nov 2015 16:41:56 +0100 Subject: [PATCH] info: minor cleanups * Rename filter() function to avoid warning of reserved built-in symbol. * Remove mediafile fixture on two tests. --- beetsplug/info.py | 4 ++-- test/test_info.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/beetsplug/info.py b/beetsplug/info.py index e8c6d987f..b719723bc 100644 --- a/beetsplug/info.py +++ b/beetsplug/info.py @@ -215,14 +215,14 @@ def make_key_filter(include): key = key.replace(r'\*', '.*') matchers.append(re.compile(key + '$')) - def filter(data): + def filter_(data): filtered = dict() for key, value in data.items(): if any(map(lambda m: m.match(key), matchers)): filtered[key] = value return filtered - return filter + return filter_ def identity(val): diff --git a/test/test_info.py b/test/test_info.py index 797950be3..bb8ffcccc 100644 --- a/test/test_info.py +++ b/test/test_info.py @@ -52,6 +52,7 @@ class InfoTest(unittest.TestCase, TestHelper): self.assertIn('disctitle: DDD', out) self.assertIn('genres: a; b; c', out) self.assertNotIn('composer:', out) + self.remove_mediafile_fixtures() def test_item_query(self): item1, item2 = self.add_item_fixtures(count=2) @@ -93,6 +94,7 @@ class InfoTest(unittest.TestCase, TestHelper): self.assertIn(u'album: AAA', out) self.assertIn(u'tracktotal: 5', out) self.assertIn(u'title: [various]', out) + self.remove_mediafile_fixtures() def test_include_pattern(self): item, = self.add_item_fixtures()