.format -> f-strings

Esmeray6 · Esmeray6 · commit 2de0395ff2ed · 2021-01-15T23:29:00.000+06:00
diff --git a/dbl/errors.py b/dbl/errors.py
@@ -62,11 +62,11 @@ def __init__(self, response, message):
         else:
             self.text = message
 
-        fmt = '{0.reason} (status code: {0.status})'
+        fmt = f"{self.response.reason} (status code: {self.response.status})"
         if self.text:
-            fmt = fmt + ': {1}'
+            fmt = f"{fmt}: {self.text}"
 
-        super().__init__(fmt.format(self.response, self.text))
+        super().__init__(fmt)
 
 
 class Unauthorized(HTTPException):
diff --git a/dbl/http.py b/dbl/http.py
@@ -33,9 +33,9 @@
 
 import aiohttp
 from aiohttp import ClientResponse
-from .ratelimiter import AsyncRateLimiter
 
 from . import __version__, errors
+from .ratelimiter import AsyncRateLimiter
 
 log = logging.getLogger(__name__)
 
@@ -85,15 +85,12 @@ def __init__(self, token, **kwargs):
         self._global_over = asyncio.Event()
         self._global_over.set()
 
-        user_agent = 'topggpy (https://github.com/top-gg/python-sdk {0}) Python/{1[0]}.{1[' \
-                     '1]} aiohttp/{2}'
-        self.user_agent = user_agent.format(__version__, sys.version_info, aiohttp.__version__)
-
-    # NOTE: current implementation doesn't maintain state over restart
+        self.user_agent = f"topggpy (https://github.com/top-gg/python-sdk {__version__}) Python/" \
+                          f"{sys.version_info[0]}.{sys.version_info[1]} aiohttp/{aiohttp.__version__}"
 
     async def request(self, method, url, **kwargs) -> Union[dict, str]:
         """Handles requests to the API."""
-        url = "{0}{1}".format(self.BASE, url)
+        url = f"{self.BASE}{url}"
 
         # handles rate limits.
         # max_calls is set to 59 because current implementation will retry in 60s
@@ -182,11 +179,11 @@ async def get_weekend_status(self):
 
     async def get_guild_count(self, bot_id):
         """Gets the guild count of the given Bot ID."""
-        return await self.request('GET', '/bots/{}/stats'.format(bot_id))
+        return await self.request('GET', f'/bots/{bot_id}/stats')
 
     async def get_bot_info(self, bot_id):
         """Gets the information of a bot under given bot ID on top.gg."""
-        resp: Union[dict, str] = await self.request('GET', '/bots/{}'.format(bot_id))
+        resp: Union[dict, str] = await self.request('GET', f'/bots/{bot_id}')
         resp['date'] = datetime.strptime(resp['date'], '%Y-%m-%dT%H:%M:%S.%fZ')
         for k in resp:
             if resp[k] == '':
@@ -195,26 +192,26 @@ async def get_bot_info(self, bot_id):
 
     async def get_bot_upvotes(self, bot_id):
         """Gets your bot's last 1000 votes on top.gg."""
-        return await self.request('GET', '/bots/{}/votes'.format(bot_id))
+        return await self.request('GET', f'/bots/{bot_id}/votes')
 
     async def get_bots(self, limit, offset, sort, search, fields):
         """Gets an object of bots on top.gg."""
         if limit > 500:
             limit = 50
         fields = ', '.join(fields)
-        search = ' '.join(['{}: {}'.format(field, value) for field, value in search.items()])
+        search = ' '.join([f'{field}: {value}' for field, value in search.items()])
 
         return await self.request('GET', '/bots', params={
             'limit': limit, 'offset': offset, 'sort': sort, 'search': search, 'fields': fields
         })
 
     async def get_user_info(self, user_id):
         """Gets an object of the user on top.gg."""
-        return await self.request('GET', '/users/{}'.format(user_id))
+        return await self.request('GET', f'/users/{user_id}')
 
     async def get_user_vote(self, bot_id, user_id):
         """Gets info whether the user has upvoted your bot."""
-        return await self.request('GET', '/bots/{}/check'.format(bot_id), params={'userId': user_id})
+        return await self.request('GET', f'/bots/{bot_id}/check', params={'userId': user_id})
 
 
 async def _ratelimit_handler(until):
diff --git a/setup.py b/setup.py
@@ -22,7 +22,7 @@
     readme = f.read()
 
 setup(name='dblpy',
-      author='{author}, top.gg'.format(author=author),
+      author=f'{author}, top.gg',
       author_email='shivaco.osu@gmail.com',
       url='https://github.com/top-gg/python-sdk',
       version=version,
@@ -33,15 +33,14 @@
       include_package_data=True,
       python_requires='>= 3.5.3',
       install_requires=requirements,
-      keywords='discord bot list discordbots botlist topgg top.gg',
+      keywords='discord bot server list discordservers serverlist discordbots botlist topgg top.gg',
       classifiers=[
           'Development Status :: 5 - Production/Stable',
           'License :: OSI Approved :: MIT License',
           'Intended Audience :: Developers',
           'Natural Language :: English',
           'Operating System :: OS Independent',
           'Programming Language :: Python :: 3 :: Only',
-          'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: 3.8',
