Run pyupgrade to Python 3.7+

mopidy_subidy/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import os
 
 from mopidy import ext, config
@@ -18,7 +16,7 @@ class SubidyExtension(ext.Extension):
         return config.read(conf_file)
 
     def get_config_schema(self):
-        schema = super(SubidyExtension, self).get_config_schema()
+        schema = super().get_config_schema()
         schema['url'] = config.String()
         schema['username'] = config.String()
         schema['password'] = config.Secret()

mopidy_subidy/backend.py

@@ -5,7 +5,7 @@ import pykka
 
 class SubidyBackend(pykka.ThreadingActor, backend.Backend):
     def __init__(self, config, audio):
-        super(SubidyBackend, self).__init__()
+        super().__init__()
         subidy_config = config['subidy']
         self.subsonic_api = subsonic_api.SubsonicApi(
             url=subidy_config['url'],

mopidy_subidy/library.py

@@ -37,7 +37,7 @@ class SubidyLibraryProvider(backend.LibraryProvider):
     _raw_vdir_to_ref = staticmethod(__raw_vdir_to_ref)
 
     def __init__(self, *args, **kwargs):
-        super(SubidyLibraryProvider, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.subsonic_api = self.backend.subsonic_api
 
     def browse_songs(self, album_id):
@@ -112,7 +112,7 @@ class SubidyLibraryProvider(backend.LibraryProvider):
 
     def lookup(self, uri=None, uris=None):
         if uris is not None:
-            return dict((uri, self.lookup_one(uri)) for uri in uris)
+            return {uri: self.lookup_one(uri) for uri in uris}
         if uri is not None:
             return self.lookup_one(uri)
         return None

mopidy_subidy/playback.py

@@ -6,7 +6,7 @@ logger = logging.getLogger(__name__)
 
 class SubidyPlaybackProvider(backend.PlaybackProvider):
     def __init__(self, *args, **kwargs):
-        super(SubidyPlaybackProvider, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.subsonic_api = self.backend.subsonic_api
 
     def translate_uri(self, translate_uri):

mopidy_subidy/playlists.py

@@ -7,7 +7,7 @@ logger = logging.getLogger(__name__)
 
 class SubidyPlaylistsProvider(backend.PlaylistsProvider):
     def __init__(self, *args, **kwargs):
-        super(SubidyPlaylistsProvider, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.subsonic_api = self.backend.subsonic_api
         self.playlists = []
         self.refresh()

mopidy_subidy/subsonic_api.py

@@ -9,10 +9,10 @@ from mopidy_subidy import uri
 
 logger = logging.getLogger(__name__)
 
-RESPONSE_OK = u'ok'
+RESPONSE_OK = 'ok'
-UNKNOWN_SONG = u'Unknown Song'
+UNKNOWN_SONG = 'Unknown Song'
-UNKNOWN_ALBUM = u'Unknown Album'
+UNKNOWN_ALBUM = 'Unknown Album'
-UNKNOWN_ARTIST = u'Unknown Artist'
+UNKNOWN_ARTIST = 'Unknown Artist'
 MAX_SEARCH_RESULTS = 100
 MAX_LIST_RESULTS = 500
 
@@ -54,7 +54,7 @@ class SubsonicApi():
         self.url = url + '/rest'
         self.username = username
         self.password = password
-        logger.info('Connecting to subsonic server on url %s as user %s, API version %s' % (url, username, api_version))
+        logger.info(f'Connecting to subsonic server on url {url} as user {username}, API version {api_version}')
         try:
             self.connection.ping()
         except Exception as e:
@@ -338,8 +338,7 @@ class SubsonicApi():
             return
         for item in diritems:
             if item.get('isDir'):
-                for song in self.get_recursive_dir_as_songs_as_tracks_iter(item.get('id')):
+                yield from self.get_recursive_dir_as_songs_as_tracks_iter(item.get('id'))
-                    yield song
             else:
                 yield self.raw_song_to_track(item)
 

mopidy_subidy/uri.py

@@ -63,7 +63,7 @@ def get_type(uri):
     return result.group(2)
 
 def get_type_uri(type, id):
-    return u'%s:%s:%s' % (PREFIX, type, id)
+    return f'{PREFIX}:{type}:{id}'
 
 def get_artist_uri(id):
     return get_type_uri(ARTIST, id)