From 1d26c2d63c69be95cdb7fe0d420025015dc06321 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 7 Dec 2014 20:13:30 +0100 Subject: [PATCH] py3: Use .item() and .values() As .iteritem() and .itervalues() doesn't exist in Python 3. --- mopidy/config/keyring.py | 4 ++-- mopidy/core/playlists.py | 2 +- mopidy/core/tracklist.py | 2 +- mopidy/local/json.py | 2 +- mopidy/local/search.py | 6 +++--- mopidy/utils/jsonrpc.py | 4 ++-- mopidy/utils/path.py | 2 +- mopidy/utils/process.py | 3 ++- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/mopidy/config/keyring.py b/mopidy/config/keyring.py index d0c8d9ed..75fa8dcf 100644 --- a/mopidy/config/keyring.py +++ b/mopidy/config/keyring.py @@ -59,7 +59,7 @@ def fetch(): result = [] secrets = service.GetSecrets(items, session, byte_arrays=True) - for item_path, values in secrets.iteritems(): + for item_path, values in secrets.items(): session_path, parameters, value, content_type = values attrs = _item_attributes(bus, item_path) result.append((attrs['section'], attrs['key'], bytes(value))) @@ -163,7 +163,7 @@ def _prompt(bus, path): def _item_attributes(bus, path): item = _interface(bus, path, 'org.freedesktop.DBus.Properties') result = item.Get('org.freedesktop.Secret.Item', 'Attributes') - return dict((bytes(k), bytes(v)) for k, v in result.iteritems()) + return dict((bytes(k), bytes(v)) for k, v in result.items()) def _interface(bus, path, interface): diff --git a/mopidy/core/playlists.py b/mopidy/core/playlists.py index a6ab654f..c896bfa7 100644 --- a/mopidy/core/playlists.py +++ b/mopidy/core/playlists.py @@ -53,7 +53,7 @@ class PlaylistsController(object): backend = self.backends.with_playlists[uri_scheme] else: # TODO: this fallback looks suspicious - backend = self.backends.with_playlists.values()[0] + backend = list(self.backends.with_playlists.values())[0] playlist = backend.playlists.create(name).get() listener.CoreListener.send('playlist_changed', playlist=playlist) return playlist diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index d9c08c3d..816e570a 100644 --- a/mopidy/core/tracklist.py +++ b/mopidy/core/tracklist.py @@ -328,7 +328,7 @@ class TracklistController(object): """ criteria = criteria or kwargs matches = self._tl_tracks - for (key, values) in criteria.iteritems(): + for (key, values) in criteria.items(): if (not isinstance(values, collections.Iterable) or isinstance(values, compat.string_types)): # Fail hard if anyone is using the <0.17 calling style diff --git a/mopidy/local/json.py b/mopidy/local/json.py index 6ebe36b7..48bd373a 100644 --- a/mopidy/local/json.py +++ b/mopidy/local/json.py @@ -164,7 +164,7 @@ class JsonLibrary(local.Library): return search.search(tracks, query=query, uris=uris) def begin(self): - return self._tracks.itervalues() + return self._tracks.values() def add(self, track): self._tracks[track.uri] = track diff --git a/mopidy/local/search.py b/mopidy/local/search.py index 375c0daa..947902ed 100644 --- a/mopidy/local/search.py +++ b/mopidy/local/search.py @@ -11,7 +11,7 @@ def find_exact(tracks, query=None, uris=None): _validate_query(query) - for (field, values) in query.iteritems(): + for (field, values) in query.items(): if not hasattr(values, '__iter__'): values = [values] # FIXME this is bound to be slow for large libraries @@ -91,7 +91,7 @@ def search(tracks, query=None, uris=None): _validate_query(query) - for (field, values) in query.iteritems(): + for (field, values) in query.items(): if not hasattr(values, '__iter__'): values = [values] # FIXME this is bound to be slow for large libraries @@ -165,7 +165,7 @@ def search(tracks, query=None, uris=None): def _validate_query(query): - for (_, values) in query.iteritems(): + for (_, values) in query.items(): if not values: raise LookupError('Missing query') for value in values: diff --git a/mopidy/utils/jsonrpc.py b/mopidy/utils/jsonrpc.py index 113edcab..7990586b 100644 --- a/mopidy/utils/jsonrpc.py +++ b/mopidy/utils/jsonrpc.py @@ -322,12 +322,12 @@ class JsonRpcInspector(object): available properties and methods. """ methods = {} - for mount, obj in self.objects.iteritems(): + for mount, obj in self.objects.items(): if inspect.isroutine(obj): methods[mount] = self._describe_method(obj) else: obj_methods = self._get_methods(obj) - for name, description in obj_methods.iteritems(): + for name, description in obj_methods.items(): if mount: name = '%s.%s' % (mount, name) methods[name] = description diff --git a/mopidy/utils/path.py b/mopidy/utils/path.py index 48e47735..de03247c 100644 --- a/mopidy/utils/path.py +++ b/mopidy/utils/path.py @@ -198,7 +198,7 @@ def _find(root, thread_count=10, relative=False, follow=False): def find_mtimes(root, follow=False): results, errors = _find(root, relative=False, follow=follow) - mtimes = dict((f, int(st.st_mtime)) for f, st in results.iteritems()) + mtimes = dict((f, int(st.st_mtime)) for f, st in results.items()) return mtimes, errors diff --git a/mopidy/utils/process.py b/mopidy/utils/process.py index cf9cbd0a..c86deb12 100644 --- a/mopidy/utils/process.py +++ b/mopidy/utils/process.py @@ -13,8 +13,9 @@ from pykka.registry import ActorRegistry logger = logging.getLogger(__name__) + SIGNALS = dict( - (k, v) for v, k in signal.__dict__.iteritems() + (k, v) for v, k in signal.__dict__.items() if v.startswith('SIG') and not v.startswith('SIG_'))