X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Fhttp.py;h=5014516e82cc228b06b421d2372a6f04eeb95f62;hb=a260ebea93f23d72aa6e0178744b0f64c469b7ba;hp=a87398b5d46ed991911260c3f528dd0d192db79b;hpb=e86c25ed9e97c5dd3e0672d5b17bed01d4a23fdf;p=mpd-sima.git diff --git a/sima/lib/http.py b/sima/lib/http.py index a87398b..5014516 100644 --- a/sima/lib/http.py +++ b/sima/lib/http.py @@ -58,7 +58,7 @@ class CacheController: """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: @@ -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