bumped version to 0.2.1

minor fixes

Author: GiovanniMCMXCIX

async_connect/__init__.py

@@ -13,7 +13,7 @@
 __author__ = 'GiovanniMCMXCIX'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2017 GiovanniMCMXCIX'
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro releaselevel serial')
 
-version_info = VersionInfo(major=0, minor=2, micro=0, releaselevel='final', serial=0)
+version_info = VersionInfo(major=0, minor=2, micro=1, releaselevel='final', serial=0)

async_connect/artist.py

@@ -49,8 +49,8 @@ class Artist:
     """
 
     __slots__ = (
-        'id', 'name', 'vanity_uri', 'profile_image_id', 'profile_image_url', 'about', 'bookings',
-        'management_detail', 'urls', 'years', '_releases', '_loop', '__loop', '_http', '__http'
+        'id', 'name', 'vanity_uri', 'profile_image_id', 'profile_image_url', 'about',
+        'bookings', 'management_detail', 'urls', 'years', '_releases', '_loop', '_http'
     )
 
     def __init__(self, **kwargs):
@@ -64,7 +64,7 @@ def __init__(self, **kwargs):
         self.management_detail = kwargs.pop('managementDetail', None)
         self.urls = kwargs.pop('urls')
         self.years = kwargs.pop('years')
-        self._http = kwargs.pop('http_client', None)
+        self._http = kwargs.pop('http', None)
         self._loop = kwargs.pop('loop', None)
 
     def __eq__(self, other):

async_connect/client.py

@@ -39,7 +39,7 @@
 
 class Client:
     def __init__(self, *, loop=None):
-        self.loop = asyncio.get_event_loop() if not loop else loop
+        self.loop = loop or asyncio.get_event_loop()
         self.http = HTTPClient(loop=self.loop)
         self._is_closed = False
 

async_connect/http.py

@@ -54,7 +54,7 @@ class HTTPClient:
     BROWSE_FILTERS = BROWSE + '/filters'
 
     def __init__(self, *, loop=None):
-        self.loop = asyncio.get_event_loop() if not loop else loop
+        self.loop = loop or asyncio.get_event_loop()
         self.session = aiohttp.ClientSession(loop=self.loop)
         self.download_link_gen = utils.DownloadLinkGenerator()
         user_agent = 'AsyncConnectBot (https://github.com/GiovanniMCMXCIX/async-connect.py {0}) ' \

async_connect/iterators.py

@@ -63,7 +63,7 @@ def __init__(self, release_id: str, *, http=None, loop=None):
 
     async def request_data(self):
         from .track import Track
-        http = HTTPClient(loop=self.loop) if not self._http else self._http
+        http = self._http or HTTPClient(loop=self.loop)
         for data in (await http.get_release_tracklist(self.id))['results']:
             track = Track(**data)
             self.items.put_nowait(track)
@@ -78,7 +78,7 @@ def __init__(self, playlist_id: str, *, http=None, loop=None):
 
     async def request_data(self):
         from .playlist import PlaylistEntry
-        http = HTTPClient(loop=self.loop) if not self._http else self._http
+        http = self._http or HTTPClient(loop=self.loop)
         for data in (await http.get_playlist_tracklist(self.id))['results']:
             track = PlaylistEntry(**data)
             self.items.put_nowait(track)
@@ -93,7 +93,7 @@ def __init__(self, artist_id: str, *, http=None, loop=None):
 
     async def request_data(self):
         from .release import Release
-        http = HTTPClient(loop=self.loop) if not self._http else self._http
+        http = self._http or HTTPClient(loop=self.loop)
         for data in (await http.get_artist_releases(self.id))['results']:
             release = Release(loop=self.loop, http=self._http, **data)
             self.items.put_nowait(release)

tests/test_get_catalog.py

@@ -45,8 +45,8 @@ def setUp(self):
     def test_release(self):
         async def test():
             release = await self.connect.get_release('MC011')
-            print('\n[connect.Client.get_release]\n{0.title} by {0.artists} had been release on {0.release_date} and has the following track(s):'.format(release))
-            print('\n'.join(['{0.title} by {0.artists}'.format(track) async for track in release.tracks]))
+            print(f'\n[connect.Client.get_release]\n{release.title} by {release.artists} had been release on {release.release_date} and has the following track(s):')
+            print('\n'.join([f'{track.title} by {track.artists}' async for track in release.tracks]))
 
         self.loop.run_until_complete(test())
 
@@ -55,14 +55,14 @@ async def test():
             playlist = await self.connect.get_playlist('577ec5395891d31a15b80c39')
             print(f'\n[connect.Client.get_playlist]\nThe playlist with the name {playlist} has the following tracks:')
             async for track in playlist.tracks:
-                print('[{0.release.catalog_id}] {0.title} by {0.artists} from {0.release.title}'.format(track))
+                print(f'[{track.release.catalog_id}] {track.title} by {track.artists} from {track.release.title}')
 
         self.loop.run_until_complete(test())
 
     def test_track(self):
         async def test():
             track = await self.connect.get_track('512bdb6db9a8860a11000029')
-            print('\n[connect.Client.get_track]\n{0.title} by {0.artists} has been featured on the following releases:'.format(track))
+            print(f'\n[connect.Client.get_track]\n{track.title} by {track.artists} has been featured on the following releases:')
             self.assertEqual(track.artists, str(await self.connect.get_artist(track.get_artists()[0].id)))
             release = await self.connect.get_release('MC011')
             self.assertEqual([album.id for album in track.albums if album.id == release.id][0], release.id)