andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix flake8 errors, prepare for Python 3 port

Browse Source 
Fixes flake8 warnings
Reword docstring for find_exact
Use range instead of xrange in preparation for porting to Python 3
This commit is contained in:
Ali Ukani 2015-02-16 00:47:48 -05:00
parent fc21d466f0
commit ead147f482
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy/local/search.py
View File

@ -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:<query>
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:<query>
return SearchResult(uri='local:search', tracks=tracks[offset:offset+limit])
return SearchResult(uri='local:search',
tracks=tracks[offset:offset + limit])
def _validate_query(query):

2
tests/local/test_json.py
View File

@ -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):