Cleanup PlayerError exception wrapper

[mpd-sima.git] / sima / lib / http.py

diff --git a/sima/lib/http.py b/sima/lib/http.py
index 3b27bddbb3e99406f909681bd03da234a3be54ce..5014516e82cc228b06b421d2372a6f04eeb95f62 100644 (file)
--- a/sima/lib/http.py
+++ b/sima/lib/http.py
@@ -45,7 +45,7 @@ def parse_uri(uri):
     return (groups[1], groups[3], groups[4], groups[6], groups[8])
 
 
-class CacheController(object):
+class CacheController:
     """An interface to see if request should cached or not.
     """
     CACHE_ANYWAY = False
@@ -58,7 +58,7 @@ class CacheController(object):
         """Normalize the URL to create a safe key for the cache"""
         (scheme, authority, path, query, _) = parse_uri(uri)
         if not scheme or not authority:
-            raise Exception("Only absolute URIs are allowed. uri = %s" % uri)
+            raise Exception(f'Only absolute URIs are allowed. uri = {uri}')
         authority = authority.lower()
         scheme = scheme.lower()
         if not path:
@@ -66,7 +66,7 @@ class CacheController(object):
 
         # Could do syntax based normalization of the URI before
         # computing the digest. See Section 6.2.2 of Std 66.
-        request_uri = query and "?".join([path, query]) or path
+        request_uri = "?".join([path, query]) if query else path
         scheme = scheme.lower()
         defrag_uri = scheme + "://" + authority + request_uri
 
@@ -101,7 +101,7 @@ class CacheController(object):
         cc = self.parse_cache_control(request.headers)
 
         # non-caching states
-        no_cache = True if 'no-cache' in cc else False
+        no_cache = bool('no-cache' in cc)
         if 'max-age' in cc and cc['max-age'] == 0:
             no_cache = True
         # see if it is in the cache anyways
@@ -294,8 +294,7 @@ class HttpClient:
         try:
             return self.fetch_ws(req)
         except Timeout as err:
-            raise WSTimeout('Failed to reach server within {0}s'.format(
-                SOCKET_TIMEOUT)) from err
+            raise WSTimeout(f'Failed to reach server within {SOCKET_TIMEOUT}s') from err
         except HTTPConnectionError as err:
             raise WSError(err) from err
 
@@ -308,7 +307,7 @@ class HttpClient:
             self.stats.update(etag=self.stats.get('etag')+1)
             resp = self.controller.update_cached_response(prepreq, resp)
         elif resp.status_code != 200:
-            raise WSHTTPError('{0.status_code}: {0.reason}'.format(resp))
+            raise WSHTTPError(f'{resp.status_code}: {resp.reason}')
         self.controller.cache_response(resp.request, resp)
         return resp