From 7acf62723afd5ef1ed403797605851edd5c9e4c4 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 7 Dec 2014 21:44:35 +0100 Subject: [PATCH] py3: Use itervalues() for local track database --- mopidy/compat.py | 6 ++++++ mopidy/local/json.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mopidy/compat.py b/mopidy/compat.py index d0e4aeb2..b563f735 100644 --- a/mopidy/compat.py +++ b/mopidy/compat.py @@ -13,6 +13,9 @@ if PY2: input = raw_input + def itervalues(dct, **kwargs): + return iter(dct.itervalues(**kwargs)) + else: import configparser # noqa import queue # noqa @@ -22,3 +25,6 @@ else: text_type = str input = input + + def itervalues(dct, **kwargs): + return iter(dct.values(**kwargs)) diff --git a/mopidy/local/json.py b/mopidy/local/json.py index 48bd373a..70dc68c4 100644 --- a/mopidy/local/json.py +++ b/mopidy/local/json.py @@ -11,7 +11,7 @@ import tempfile import time import mopidy -from mopidy import local, models +from mopidy import compat, local, models from mopidy.local import search, storage, translator from mopidy.utils import encoding @@ -164,7 +164,7 @@ class JsonLibrary(local.Library): return search.search(tracks, query=query, uris=uris) def begin(self): - return self._tracks.values() + return compat.itervalues(self._tracks) def add(self, track): self._tracks[track.uri] = track