From ead147f482995baeac8349871c916c9df6d34840 Mon Sep 17 00:00:00 2001 From: Ali Ukani Date: Mon, 16 Feb 2015 00:47:48 -0500 Subject: [PATCH] Fix flake8 errors, prepare for Python 3 port Fixes flake8 warnings Reword docstring for find_exact Use range instead of xrange in preparation for porting to Python 3 --- mopidy/local/search.py | 9 +++++---- tests/local/test_json.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mopidy/local/search.py b/mopidy/local/search.py index 9e56d73b..1f82366f 100644 --- a/mopidy/local/search.py +++ b/mopidy/local/search.py @@ -8,7 +8,7 @@ def find_exact(tracks, query=None, limit=100, offset=0, uris=None): Filter a list of tracks where ``field`` is ``values``. :param list tracks: a list of :class:`~mopidy.models.Track` - :param dict query: one or more queries to search for + :param dict query: one or more field/value pairs to search for :param int limit: maximum number of results to return :param int offset: offset into result set to use. :param uris: zero or more URI roots to limit the search to @@ -108,7 +108,7 @@ def find_exact(tracks, query=None, limit=100, offset=0, uris=None): # TODO: add local:search: return SearchResult( - uri='local:search', tracks=tracks[offset:offset+limit]) + uri='local:search', tracks=tracks[offset:offset + limit]) def search(tracks, query=None, limit=100, offset=0, uris=None): @@ -116,7 +116,7 @@ def search(tracks, query=None, limit=100, offset=0, uris=None): Filter a list of tracks where ``field`` is like ``values``. :param list tracks: a list of :class:`~mopidy.models.Track` - :param dict query: one or more queries to search for + :param dict query: one or more field/value pairs to search for :param int limit: maximum number of results to return :param int offset: offset into result set to use. :param uris: zero or more URI roots to limit the search to @@ -218,7 +218,8 @@ def search(tracks, query=None, limit=100, offset=0, uris=None): else: raise LookupError('Invalid lookup field: %s' % field) # TODO: add local:search: - return SearchResult(uri='local:search', tracks=tracks[offset:offset+limit]) + return SearchResult(uri='local:search', + tracks=tracks[offset:offset + limit]) def _validate_query(query): diff --git a/tests/local/test_json.py b/tests/local/test_json.py index 545833d5..6d57c4d0 100644 --- a/tests/local/test_json.py +++ b/tests/local/test_json.py @@ -59,7 +59,7 @@ class JsonLibraryTest(unittest.TestCase): self.library = json.JsonLibrary(self.config) def _create_tracks(self, count): - for i in xrange(count): + for i in range(count): self.library.add(Track(uri='local:track:%d' % i)) def test_search_should_default_limit_results(self):