Improve list/dict comprehensions (#1036)

* Improve list/dict comprehensions

* Dont make needless list() conversions before bytes.join()

Co-authored-by: Florimond Manca <florimond.manca@gmail.com>

diff --git a/httpx/_models.py b/httpx/_models.py
index 67374266442c2c5adc5545108ccde597e689eca8..8221e72f11013a453e183f8b8042fa4685b9acbd 100644 (file)
--- a/httpx/_models.py
+++ b/httpx/_models.py
@@ -651,7 +651,7 @@ class Request:
         Read and return the request content.
         """
         if not hasattr(self, "_content"):
-            self._content = b"".join([part for part in self.stream])
+            self._content = b"".join(self.stream)
             # If a streaming request has been read entirely into memory, then
             # we can replace the stream with a raw bytes implementation,
             # to ensure that any non-replayable streams can still be used.
@@ -895,7 +895,7 @@ class Response:
         Read and return the response content.
         """
         if not hasattr(self, "_content"):
-            self._content = b"".join([part for part in self.iter_bytes()])
+            self._content = b"".join(self.iter_bytes())
         return self._content
 
     def iter_bytes(self) -> typing.Iterator[bytes]:

diff --git a/httpx/_transports/urllib3.py b/httpx/_transports/urllib3.py
index 705eb71503643e8d5f71e96b75d41b6844833c8c..fe8a89ba85daacdbb95e8eccb3451bab1bffeae7 100644 (file)
--- a/httpx/_transports/urllib3.py
+++ b/httpx/_transports/urllib3.py
@@ -88,12 +88,9 @@ class URLLib3Transport(httpcore.SyncHTTPTransport):
             conn = self.pool.urlopen(
                 method=method.decode(),
                 url=url_str,
-                headers=dict(
-                    [
-                        (key.decode("ascii"), value.decode("ascii"))
-                        for key, value in headers
-                    ]
-                ),
+                headers={
+                    key.decode("ascii"): value.decode("ascii") for key, value in headers
+                },
                 body=body,
                 redirect=False,
                 assert_same_host=False,

diff --git a/httpx/_transports/wsgi.py b/httpx/_transports/wsgi.py
index 208334fafd6b00418e03d5976e6b6e4815c631d2..717270d40dd54dc891fdeec74ae8e58697d049f5 100644 (file)
--- a/httpx/_transports/wsgi.py
+++ b/httpx/_transports/wsgi.py
@@ -83,7 +83,7 @@ class WSGITransport(httpcore.SyncHTTPTransport):
         environ = {
             "wsgi.version": (1, 0),
             "wsgi.url_scheme": scheme.decode("ascii"),
-            "wsgi.input": io.BytesIO(b"".join([chunk for chunk in stream])),
+            "wsgi.input": io.BytesIO(b"".join(stream)),
             "wsgi.errors": io.BytesIO(),
             "wsgi.multithread": True,
             "wsgi.multiprocess": False,

diff --git a/tests/client/test_headers.py b/tests/client/test_headers.py
index 4d087f9bc1eaae7d194f18e2f98f362881c5e215..6f26b1c7b34a10b07d81223db24b22bc1113d61c 100755 (executable)
--- a/tests/client/test_headers.py
+++ b/tests/client/test_headers.py
@@ -20,9 +20,9 @@ class MockTransport(httpcore.AsyncHTTPTransport):
     ) -> typing.Tuple[
         bytes, int, bytes, typing.List[typing.Tuple[bytes, bytes]], ContentStream
     ]:
-        headers_dict = dict(
-            [(key.decode("ascii"), value.decode("ascii")) for key, value in headers]
-        )
+        headers_dict = {
+            key.decode("ascii"): value.decode("ascii") for key, value in headers
+        }
         body = JSONStream({"headers": headers_dict})
         return b"HTTP/1.1", 200, b"OK", [], body
 

diff --git a/tests/client/test_redirects.py b/tests/client/test_redirects.py
index b39e8d0e9e02e058835ffda156dc3afcdf387705..dea1df284d07ebc7af835dc1bd396d0e689d618b 100644 (file)
--- a/tests/client/test_redirects.py
+++ b/tests/client/test_redirects.py
@@ -100,9 +100,9 @@ class MockTransport:
             return b"HTTP/1.1", code, b"See Other", headers, ByteStream(b"")
 
         elif path == b"/cross_domain_target":
-            headers_dict = dict(
-                [(key.decode("ascii"), value.decode("ascii")) for key, value in headers]
-            )
+            headers_dict = {
+                key.decode("ascii"): value.decode("ascii") for key, value in headers
+            }
             content = ByteStream(json.dumps({"headers": headers_dict}).encode())
             return b"HTTP/1.1", 200, b"OK", [], content
 
@@ -118,9 +118,9 @@ class MockTransport:
 
         elif path == b"/redirect_body_target":
             content = b"".join(stream)
-            headers_dict = dict(
-                [(key.decode("ascii"), value.decode("ascii")) for key, value in headers]
-            )
+            headers_dict = {
+                key.decode("ascii"): value.decode("ascii") for key, value in headers
+            }
             body = ByteStream(
                 json.dumps({"body": content.decode(), "headers": headers_dict}).encode()
             )