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

py3: Use itervalues() for local track database

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-12-07 21:44:35 +01:00
parent 4f428b8601
commit 7acf62723a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy/compat.py
View File

@ -13,6 +13,9 @@ if PY2:
input = raw_input input = raw_input
def itervalues(dct, **kwargs):
return iter(dct.itervalues(**kwargs))
else: else:
import configparser # noqa import configparser # noqa
import queue # noqa import queue # noqa
@ -22,3 +25,6 @@ else:
text_type = str text_type = str
input = input input = input
def itervalues(dct, **kwargs):
return iter(dct.values(**kwargs))

4
mopidy/local/json.py
View File

@ -11,7 +11,7 @@ import tempfile
import time import time
import mopidy import mopidy
from mopidy import local, models from mopidy import compat, local, models
from mopidy.local import search, storage, translator from mopidy.local import search, storage, translator
from mopidy.utils import encoding from mopidy.utils import encoding
@ -164,7 +164,7 @@ class JsonLibrary(local.Library):
return search.search(tracks, query=query, uris=uris) return search.search(tracks, query=query, uris=uris)
def begin(self): def begin(self):
return self._tracks.values() return compat.itervalues(self._tracks)
def add(self, track): def add(self, track):
self._tracks[track.uri] = track self._tracks[track.uri] = track