Skip to content

Commit 03d2b34

Browse files
lovelydinosaurlovelydinosaur
authored
Cleanup (#143)
1 parent 7e8d156 commit 03d2b34

File tree

10 files changed

+38
-44
lines changed

10 files changed

+38
-44
lines changed

‎src/ahttpx/_client.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def build_request(
3535
self,
3636
method: Method | str,
3737
url: URL | str,
38-
headers: Headers | typing.Mapping[str, str] | None = None,
38+
headers: Headers | dict[str, str] | None = None,
3939
content: Content | Stream | bytes | None = None,
4040
) -> Request:
4141
return Request(
@@ -49,7 +49,7 @@ async def request(
4949
self,
5050
method: Method | str,
5151
url: URL | str,
52-
headers: Headers | typing.Mapping[str, str] | None = None,
52+
headers: Headers | dict[str, str] | None = None,
5353
content: Content | Stream | bytes | None = None,
5454
) -> Response:
5555
request = self.build_request(method, url, headers=headers, content=content)
@@ -61,7 +61,7 @@ async def stream(
6161
self,
6262
method: Method | str,
6363
url: URL | str,
64-
headers: Headers | typing.Mapping[str, str] | None = None,
64+
headers: Headers | dict[str, str] | None = None,
6565
content: Content | Stream | bytes | None = None,
6666
) -> Response:
6767
request = self.build_request(method, url, headers=headers, content=content)
@@ -70,38 +70,38 @@ async def stream(
7070
async def get(
7171
self,
7272
url: URL | str,
73-
headers: Headers | typing.Mapping[str, str] | None = None,
73+
headers: Headers | dict[str, str] | None = None,
7474
):
7575
return await self.request("GET", url, headers=headers)
7676

7777
async def post(
7878
self,
7979
url: URL | str,
80-
headers: Headers | typing.Mapping[str, str] | None = None,
80+
headers: Headers | dict[str, str] | None = None,
8181
content: Content | Stream | bytes | None = None,
8282
):
8383
return await self.request("POST", url, headers=headers, content=content)
8484

8585
async def put(
8686
self,
8787
url: URL | str,
88-
headers: Headers | typing.Mapping[str, str] | None = None,
88+
headers: Headers | dict[str, str] | None = None,
8989
content: Content | Stream | bytes | None = None,
9090
):
9191
return await self.request("PUT", url, headers=headers, content=content)
9292

9393
async def patch(
9494
self,
9595
url: URL | str,
96-
headers: Headers | typing.Mapping[str, str] | None = None,
96+
headers: Headers | dict[str, str] | None = None,
9797
content: Content | Stream | bytes | None = None,
9898
):
9999
return await self.request("PATCH", url, headers=headers, content=content)
100100

101101
async def delete(
102102
self,
103103
url: URL | str,
104-
headers: Headers | typing.Mapping[str, str] | None = None,
104+
headers: Headers | dict[str, str] | None = None,
105105
):
106106
return await self.request("DELETE", url, headers=headers)
107107

‎src/ahttpx/_pool.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ async def request(
185185
self,
186186
method: Method | str,
187187
url: URL | str,
188-
headers: Headers | typing.Mapping[str, str] | None = None,
188+
headers: Headers | dict[str, str] | None = None,
189189
content: Content | Stream | bytes | None = None,
190190
) -> Response:
191191
url = self._origin.join(url)
@@ -198,7 +198,7 @@ async def stream(
198198
self,
199199
method: Method | str,
200200
url: URL | str,
201-
headers: Headers | typing.Mapping[str, str] | None = None,
201+
headers: Headers | dict[str, str] | None = None,
202202
content: Content | Stream | bytes | None = None,
203203
) -> Response:
204204
url = self._origin.join(url)
@@ -211,10 +211,7 @@ async def _send_head(self, request: Request) -> None:
211211
target = request.url.target.encode('ascii')
212212
protocol = b'HTTP/1.1'
213213
await self._parser.send_method_line(method, target, protocol)
214-
headers = [
215-
(k.encode('ascii'), v.encode('ascii'))
216-
for k, v in request.headers.items()
217-
]
214+
headers = request.headers.as_byte_pairs()
218215
await self._parser.send_headers(headers)
219216

220217
async def _send_body(self, request: Request) -> None:

‎src/ahttpx/_quickstart.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,38 @@
1212

1313
async def get(
1414
url: URL | str,
15-
headers: Headers | typing.Mapping[str, str] | None = None,
15+
headers: Headers | dict[str, str] | None = None,
1616
):
1717
async with Client() as client:
1818
return await client.request("GET", url=url, headers=headers)
1919

2020
async def post(
2121
url: URL | str,
22-
headers: Headers | typing.Mapping[str, str] | None = None,
22+
headers: Headers | dict[str, str] | None = None,
2323
content: Content | Stream | bytes | None = None,
2424
):
2525
async with Client() as client:
2626
return await client.request("POST", url, headers=headers, content=content)
2727

2828
async def put(
2929
url: URL | str,
30-
headers: Headers | typing.Mapping[str, str] | None = None,
30+
headers: Headers | dict[str, str] | None = None,
3131
content: Content | Stream | bytes | None = None,
3232
):
3333
async with Client() as client:
3434
return await client.request("PUT", url, headers=headers, content=content)
3535

3636
async def patch(
3737
url: URL | str,
38-
headers: Headers | typing.Mapping[str, str] | None = None,
38+
headers: Headers | dict[str, str] | None = None,
3939
content: Content | Stream | bytes | None = None,
4040
):
4141
async with Client() as client:
4242
return await client.request("PATCH", url, headers=headers, content=content)
4343

4444
async def delete(
4545
url: URL | str,
46-
headers: Headers | typing.Mapping[str, str] | None = None,
46+
headers: Headers | dict[str, str] | None = None,
4747
):
4848
async with Client() as client:
4949
return await client.request("DELETE", url=url, headers=headers)

‎src/ahttpx/_request.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from ._headers import Headers
77
from ._urls import URL
88

9-
__all__ = ["Request"]
9+
__all__ = ["Method", "Request"]
1010

1111

1212
class Method:
@@ -35,7 +35,7 @@ def __init__(
3535
self,
3636
method: Method | str,
3737
url: URL | str,
38-
headers: Headers | typing.Mapping[str, str] | None = None,
38+
headers: Headers | dict[str, str] | None = None,
3939
content: Content | Stream | bytes | None = None,
4040
):
4141
self.method = Method(method) if not isinstance(method, Method) else method

‎src/ahttpx/_response.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def __init__(
134134
self,
135135
status_code: StatusCode | int,
136136
*,
137-
headers: Headers | typing.Mapping[str, str] | None = None,
137+
headers: Headers | dict[str, str] | None = None,
138138
content: Content | Stream | bytes | None = None,
139139
):
140140
self.status_code = StatusCode(status_code) if not isinstance(status_code, StatusCode) else status_code

‎src/httpx/_client.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def build_request(
3535
self,
3636
method: Method | str,
3737
url: URL | str,
38-
headers: Headers | typing.Mapping[str, str] | None = None,
38+
headers: Headers | dict[str, str] | None = None,
3939
content: Content | Stream | bytes | None = None,
4040
) -> Request:
4141
return Request(
@@ -49,7 +49,7 @@ def request(
4949
self,
5050
method: Method | str,
5151
url: URL | str,
52-
headers: Headers | typing.Mapping[str, str] | None = None,
52+
headers: Headers | dict[str, str] | None = None,
5353
content: Content | Stream | bytes | None = None,
5454
) -> Response:
5555
request = self.build_request(method, url, headers=headers, content=content)
@@ -61,7 +61,7 @@ def stream(
6161
self,
6262
method: Method | str,
6363
url: URL | str,
64-
headers: Headers | typing.Mapping[str, str] | None = None,
64+
headers: Headers | dict[str, str] | None = None,
6565
content: Content | Stream | bytes | None = None,
6666
) -> Response:
6767
request = self.build_request(method, url, headers=headers, content=content)
@@ -70,38 +70,38 @@ def stream(
7070
def get(
7171
self,
7272
url: URL | str,
73-
headers: Headers | typing.Mapping[str, str] | None = None,
73+
headers: Headers | dict[str, str] | None = None,
7474
):
7575
return self.request("GET", url, headers=headers)
7676

7777
def post(
7878
self,
7979
url: URL | str,
80-
headers: Headers | typing.Mapping[str, str] | None = None,
80+
headers: Headers | dict[str, str] | None = None,
8181
content: Content | Stream | bytes | None = None,
8282
):
8383
return self.request("POST", url, headers=headers, content=content)
8484

8585
def put(
8686
self,
8787
url: URL | str,
88-
headers: Headers | typing.Mapping[str, str] | None = None,
88+
headers: Headers | dict[str, str] | None = None,
8989
content: Content | Stream | bytes | None = None,
9090
):
9191
return self.request("PUT", url, headers=headers, content=content)
9292

9393
def patch(
9494
self,
9595
url: URL | str,
96-
headers: Headers | typing.Mapping[str, str] | None = None,
96+
headers: Headers | dict[str, str] | None = None,
9797
content: Content | Stream | bytes | None = None,
9898
):
9999
return self.request("PATCH", url, headers=headers, content=content)
100100

101101
def delete(
102102
self,
103103
url: URL | str,
104-
headers: Headers | typing.Mapping[str, str] | None = None,
104+
headers: Headers | dict[str, str] | None = None,
105105
):
106106
return self.request("DELETE", url, headers=headers)
107107

‎src/httpx/_pool.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def request(
185185
self,
186186
method: Method | str,
187187
url: URL | str,
188-
headers: Headers | typing.Mapping[str, str] | None = None,
188+
headers: Headers | dict[str, str] | None = None,
189189
content: Content | Stream | bytes | None = None,
190190
) -> Response:
191191
url = self._origin.join(url)
@@ -198,7 +198,7 @@ def stream(
198198
self,
199199
method: Method | str,
200200
url: URL | str,
201-
headers: Headers | typing.Mapping[str, str] | None = None,
201+
headers: Headers | dict[str, str] | None = None,
202202
content: Content | Stream | bytes | None = None,
203203
) -> Response:
204204
url = self._origin.join(url)
@@ -211,10 +211,7 @@ def _send_head(self, request: Request) -> None:
211211
target = request.url.target.encode('ascii')
212212
protocol = b'HTTP/1.1'
213213
self._parser.send_method_line(method, target, protocol)
214-
headers = [
215-
(k.encode('ascii'), v.encode('ascii'))
216-
for k, v in request.headers.items()
217-
]
214+
headers = request.headers.as_byte_pairs()
218215
self._parser.send_headers(headers)
219216

220217
def _send_body(self, request: Request) -> None:

‎src/httpx/_quickstart.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,38 @@
1212

1313
def get(
1414
url: URL | str,
15-
headers: Headers | typing.Mapping[str, str] | None = None,
15+
headers: Headers | dict[str, str] | None = None,
1616
):
1717
with Client() as client:
1818
return client.request("GET", url=url, headers=headers)
1919

2020
def post(
2121
url: URL | str,
22-
headers: Headers | typing.Mapping[str, str] | None = None,
22+
headers: Headers | dict[str, str] | None = None,
2323
content: Content | Stream | bytes | None = None,
2424
):
2525
with Client() as client:
2626
return client.request("POST", url, headers=headers, content=content)
2727

2828
def put(
2929
url: URL | str,
30-
headers: Headers | typing.Mapping[str, str] | None = None,
30+
headers: Headers | dict[str, str] | None = None,
3131
content: Content | Stream | bytes | None = None,
3232
):
3333
with Client() as client:
3434
return client.request("PUT", url, headers=headers, content=content)
3535

3636
def patch(
3737
url: URL | str,
38-
headers: Headers | typing.Mapping[str, str] | None = None,
38+
headers: Headers | dict[str, str] | None = None,
3939
content: Content | Stream | bytes | None = None,
4040
):
4141
with Client() as client:
4242
return client.request("PATCH", url, headers=headers, content=content)
4343

4444
def delete(
4545
url: URL | str,
46-
headers: Headers | typing.Mapping[str, str] | None = None,
46+
headers: Headers | dict[str, str] | None = None,
4747
):
4848
with Client() as client:
4949
return client.request("DELETE", url=url, headers=headers)

‎src/httpx/_request.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from ._headers import Headers
77
from ._urls import URL
88

9-
__all__ = ["Request"]
9+
__all__ = ["Method", "Request"]
1010

1111

1212
class Method:
@@ -35,7 +35,7 @@ def __init__(
3535
self,
3636
method: Method | str,
3737
url: URL | str,
38-
headers: Headers | typing.Mapping[str, str] | None = None,
38+
headers: Headers | dict[str, str] | None = None,
3939
content: Content | Stream | bytes | None = None,
4040
):
4141
self.method = Method(method) if not isinstance(method, Method) else method

‎src/httpx/_response.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def __init__(
134134
self,
135135
status_code: StatusCode | int,
136136
*,
137-
headers: Headers | typing.Mapping[str, str] | None = None,
137+
headers: Headers | dict[str, str] | None = None,
138138
content: Content | Stream | bytes | None = None,
139139
):
140140
self.status_code = StatusCode(status_code) if not isinstance(status_code, StatusCode) else status_code

0 commit comments

Comments
 (0)