From 4e60c86248268eda5bf12ea5caeb5de2fce76193 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Tue, 10 Jul 2018 15:30:54 +0100 Subject: [PATCH] Black formatting --- starlette/__init__.py | 8 +++++++- starlette/datastructures.py | 19 ++++++++++--------- starlette/response.py | 14 +++++++------- starlette/testclient.py | 3 ++- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/starlette/__init__.py b/starlette/__init__.py index 1c2288c0..22ae9352 100644 --- a/starlette/__init__.py +++ b/starlette/__init__.py @@ -1,5 +1,11 @@ from starlette.decorators import asgi_application -from starlette.response import HTMLResponse, JSONResponse, Response, PlainTextResponse, StreamingResponse +from starlette.response import ( + HTMLResponse, + JSONResponse, + Response, + PlainTextResponse, + StreamingResponse, +) from starlette.request import Request from starlette.routing import Path, PathPrefix, Router from starlette.testclient import TestClient diff --git a/starlette/datastructures.py b/starlette/datastructures.py index ae3fb37e..cfb24bf9 100644 --- a/starlette/datastructures.py +++ b/starlette/datastructures.py @@ -131,14 +131,14 @@ class Headers(typing.Mapping[str, str]): self._list = value def keys(self): - return [key.decode('latin-1') for key, value in self._list] + return [key.decode("latin-1") for key, value in self._list] def values(self): - return [value.decode('latin-1') for key, value in self._list] + return [value.decode("latin-1") for key, value in self._list] def items(self): return [ - (key.decode('latin-1'), value.decode('latin-1')) + (key.decode("latin-1"), value.decode("latin-1")) for key, value in self._list ] @@ -149,17 +149,18 @@ class Headers(typing.Mapping[str, str]): return default def get_list(self, key: str) -> typing.List[str]: - get_header_key = key.lower().encode('latin-1') + get_header_key = key.lower().encode("latin-1") return [ - item_value.decode('latin-1') for item_key, item_value in self._list + item_value.decode("latin-1") + for item_key, item_value in self._list if item_key == get_header_key ] def __getitem__(self, key: str): - get_header_key = key.lower().encode('latin-1') + get_header_key = key.lower().encode("latin-1") for header_key, header_value in self._list: if header_key == get_header_key: - return header_value.decode('latin-1') + return header_value.decode("latin-1") raise KeyError(key) def __contains__(self, key: str): @@ -182,8 +183,8 @@ class Headers(typing.Mapping[str, str]): class MutableHeaders(Headers): def __setitem__(self, key: str, value: str): - set_key = key.lower().encode('latin-1') - set_value = value.encode('latin-1') + set_key = key.lower().encode("latin-1") + set_value = value.encode("latin-1") pop_indexes = [] for idx, (item_key, item_value) in enumerate(self._list): diff --git a/starlette/response.py b/starlette/response.py index 18f5aea7..28d0efd8 100644 --- a/starlette/response.py +++ b/starlette/response.py @@ -13,7 +13,7 @@ class Response: content: typing.Any, status_code: int = 200, headers: dict = None, - media_type: str = None + media_type: str = None, ) -> None: self.body = self.render(content) self.status_code = status_code @@ -33,7 +33,7 @@ class Response: missing_content_type = True else: raw_headers = [ - (k.lower().encode('latin-1'), v.encode('latin-1')) + (k.lower().encode("latin-1"), v.encode("latin-1")) for k, v in headers.items() ] missing_content_length = "content-length" not in headers @@ -47,14 +47,14 @@ class Response: content_type = self.media_type if content_type.startswith("text/") and self.charset is not None: content_type += "; charset=%s" % self.charset - content_type_value = content_type.encode('latin-1') + content_type_value = content_type.encode("latin-1") raw_headers.append((b"content-type", content_type_value)) self.raw_headers = raw_headers @property def headers(self): - if not hasattr(self, '_headers'): + if not hasattr(self, "_headers"): self._headers = MutableHeaders(self.raw_headers) return self._headers @@ -96,7 +96,7 @@ class StreamingResponse(Response): content: typing.Any, status_code: int = 200, headers: dict = None, - media_type: str = None + media_type: str = None, ) -> None: self.body_iterator = content self.status_code = status_code @@ -126,7 +126,7 @@ class StreamingResponse(Response): missing_content_type = True else: raw_headers = [ - (k.lower().encode('latin-1'), v.encode('latin-1')) + (k.lower().encode("latin-1"), v.encode("latin-1")) for k, v in headers.items() ] missing_content_type = "content-type" not in headers @@ -135,7 +135,7 @@ class StreamingResponse(Response): content_type = self.media_type if content_type.startswith("text/") and self.charset is not None: content_type += "; charset=%s" % self.charset - content_type_value = content_type.encode('latin-1') + content_type_value = content_type.encode("latin-1") raw_headers.append((b"content-type", content_type_value)) self.raw_headers = raw_headers diff --git a/starlette/testclient.py b/starlette/testclient.py index ac163125..1073d365 100644 --- a/starlette/testclient.py +++ b/starlette/testclient.py @@ -48,7 +48,8 @@ class _ASGIAdapter(requests.adapters.HTTPAdapter): # Include other request headers. headers += [ - [key.lower().encode(), value.encode()] for key, value in request.headers.items() + [key.lower().encode(), value.encode()] + for key, value in request.headers.items() ] scope = { -- 2.47.2