Skip to content

Commit 14a1704

Browse files
Michael Oliverflorimondmancamichaeloliverx
authored
Switch to explicit typing.Optional throughout (#2096)
* Fix issue with Mypy `--strict` and `AsyncExitStack` * Enable `no_implicit_optional` in Mypy * Ignore internal type errors * Bump `httpcore` * Remove unneeded type: ignore comments Co-authored-by: Florimond Manca <[email protected]> Co-authored-by: Michael Oliver <[email protected]>
1 parent 9673a35 commit 14a1704

File tree

15 files changed

+365
-323
lines changed

15 files changed

+365
-323
lines changed

‎httpx/_api.py

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ def request(
2424
method: str,
2525
url: URLTypes,
2626
*,
27-
params: QueryParamTypes = None,
28-
content: RequestContent = None,
29-
data: RequestData = None,
30-
files: RequestFiles = None,
31-
json: typing.Any = None,
32-
headers: HeaderTypes = None,
33-
cookies: CookieTypes = None,
34-
auth: AuthTypes = None,
35-
proxies: ProxiesTypes = None,
27+
params: typing.Optional[QueryParamTypes] = None,
28+
content: typing.Optional[RequestContent] = None,
29+
data: typing.Optional[RequestData] = None,
30+
files: typing.Optional[RequestFiles] = None,
31+
json: typing.Optional[typing.Any] = None,
32+
headers: typing.Optional[HeaderTypes] = None,
33+
cookies: typing.Optional[CookieTypes] = None,
34+
auth: typing.Optional[AuthTypes] = None,
35+
proxies: typing.Optional[ProxiesTypes] = None,
3636
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
3737
follow_redirects: bool = False,
3838
verify: VerifyTypes = True,
39-
cert: CertTypes = None,
39+
cert: typing.Optional[CertTypes] = None,
4040
trust_env: bool = True,
4141
) -> Response:
4242
"""
@@ -116,19 +116,19 @@ def stream(
116116
method: str,
117117
url: URLTypes,
118118
*,
119-
params: QueryParamTypes = None,
120-
content: RequestContent = None,
121-
data: RequestData = None,
122-
files: RequestFiles = None,
123-
json: typing.Any = None,
124-
headers: HeaderTypes = None,
125-
cookies: CookieTypes = None,
126-
auth: AuthTypes = None,
127-
proxies: ProxiesTypes = None,
119+
params: typing.Optional[QueryParamTypes] = None,
120+
content: typing.Optional[RequestContent] = None,
121+
data: typing.Optional[RequestData] = None,
122+
files: typing.Optional[RequestFiles] = None,
123+
json: typing.Optional[typing.Any] = None,
124+
headers: typing.Optional[HeaderTypes] = None,
125+
cookies: typing.Optional[CookieTypes] = None,
126+
auth: typing.Optional[AuthTypes] = None,
127+
proxies: typing.Optional[ProxiesTypes] = None,
128128
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
129129
follow_redirects: bool = False,
130130
verify: VerifyTypes = True,
131-
cert: CertTypes = None,
131+
cert: typing.Optional[CertTypes] = None,
132132
trust_env: bool = True,
133133
) -> typing.Iterator[Response]:
134134
"""
@@ -167,13 +167,13 @@ def stream(
167167
def get(
168168
url: URLTypes,
169169
*,
170-
params: QueryParamTypes = None,
171-
headers: HeaderTypes = None,
172-
cookies: CookieTypes = None,
173-
auth: AuthTypes = None,
174-
proxies: ProxiesTypes = None,
170+
params: typing.Optional[QueryParamTypes] = None,
171+
headers: typing.Optional[HeaderTypes] = None,
172+
cookies: typing.Optional[CookieTypes] = None,
173+
auth: typing.Optional[AuthTypes] = None,
174+
proxies: typing.Optional[ProxiesTypes] = None,
175175
follow_redirects: bool = False,
176-
cert: CertTypes = None,
176+
cert: typing.Optional[CertTypes] = None,
177177
verify: VerifyTypes = True,
178178
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
179179
trust_env: bool = True,
@@ -205,13 +205,13 @@ def get(
205205
def options(
206206
url: URLTypes,
207207
*,
208-
params: QueryParamTypes = None,
209-
headers: HeaderTypes = None,
210-
cookies: CookieTypes = None,
211-
auth: AuthTypes = None,
212-
proxies: ProxiesTypes = None,
208+
params: typing.Optional[QueryParamTypes] = None,
209+
headers: typing.Optional[HeaderTypes] = None,
210+
cookies: typing.Optional[CookieTypes] = None,
211+
auth: typing.Optional[AuthTypes] = None,
212+
proxies: typing.Optional[ProxiesTypes] = None,
213213
follow_redirects: bool = False,
214-
cert: CertTypes = None,
214+
cert: typing.Optional[CertTypes] = None,
215215
verify: VerifyTypes = True,
216216
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
217217
trust_env: bool = True,
@@ -243,13 +243,13 @@ def options(
243243
def head(
244244
url: URLTypes,
245245
*,
246-
params: QueryParamTypes = None,
247-
headers: HeaderTypes = None,
248-
cookies: CookieTypes = None,
249-
auth: AuthTypes = None,
250-
proxies: ProxiesTypes = None,
246+
params: typing.Optional[QueryParamTypes] = None,
247+
headers: typing.Optional[HeaderTypes] = None,
248+
cookies: typing.Optional[CookieTypes] = None,
249+
auth: typing.Optional[AuthTypes] = None,
250+
proxies: typing.Optional[ProxiesTypes] = None,
251251
follow_redirects: bool = False,
252-
cert: CertTypes = None,
252+
cert: typing.Optional[CertTypes] = None,
253253
verify: VerifyTypes = True,
254254
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
255255
trust_env: bool = True,
@@ -281,17 +281,17 @@ def head(
281281
def post(
282282
url: URLTypes,
283283
*,
284-
content: RequestContent = None,
285-
data: RequestData = None,
286-
files: RequestFiles = None,
287-
json: typing.Any = None,
288-
params: QueryParamTypes = None,
289-
headers: HeaderTypes = None,
290-
cookies: CookieTypes = None,
291-
auth: AuthTypes = None,
292-
proxies: ProxiesTypes = None,
284+
content: typing.Optional[RequestContent] = None,
285+
data: typing.Optional[RequestData] = None,
286+
files: typing.Optional[RequestFiles] = None,
287+
json: typing.Optional[typing.Any] = None,
288+
params: typing.Optional[QueryParamTypes] = None,
289+
headers: typing.Optional[HeaderTypes] = None,
290+
cookies: typing.Optional[CookieTypes] = None,
291+
auth: typing.Optional[AuthTypes] = None,
292+
proxies: typing.Optional[ProxiesTypes] = None,
293293
follow_redirects: bool = False,
294-
cert: CertTypes = None,
294+
cert: typing.Optional[CertTypes] = None,
295295
verify: VerifyTypes = True,
296296
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
297297
trust_env: bool = True,
@@ -324,17 +324,17 @@ def post(
324324
def put(
325325
url: URLTypes,
326326
*,
327-
content: RequestContent = None,
328-
data: RequestData = None,
329-
files: RequestFiles = None,
330-
json: typing.Any = None,
331-
params: QueryParamTypes = None,
332-
headers: HeaderTypes = None,
333-
cookies: CookieTypes = None,
334-
auth: AuthTypes = None,
335-
proxies: ProxiesTypes = None,
327+
content: typing.Optional[RequestContent] = None,
328+
data: typing.Optional[RequestData] = None,
329+
files: typing.Optional[RequestFiles] = None,
330+
json: typing.Optional[typing.Any] = None,
331+
params: typing.Optional[QueryParamTypes] = None,
332+
headers: typing.Optional[HeaderTypes] = None,
333+
cookies: typing.Optional[CookieTypes] = None,
334+
auth: typing.Optional[AuthTypes] = None,
335+
proxies: typing.Optional[ProxiesTypes] = None,
336336
follow_redirects: bool = False,
337-
cert: CertTypes = None,
337+
cert: typing.Optional[CertTypes] = None,
338338
verify: VerifyTypes = True,
339339
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
340340
trust_env: bool = True,
@@ -367,17 +367,17 @@ def put(
367367
def patch(
368368
url: URLTypes,
369369
*,
370-
content: RequestContent = None,
371-
data: RequestData = None,
372-
files: RequestFiles = None,
373-
json: typing.Any = None,
374-
params: QueryParamTypes = None,
375-
headers: HeaderTypes = None,
376-
cookies: CookieTypes = None,
377-
auth: AuthTypes = None,
378-
proxies: ProxiesTypes = None,
370+
content: typing.Optional[RequestContent] = None,
371+
data: typing.Optional[RequestData] = None,
372+
files: typing.Optional[RequestFiles] = None,
373+
json: typing.Optional[typing.Any] = None,
374+
params: typing.Optional[QueryParamTypes] = None,
375+
headers: typing.Optional[HeaderTypes] = None,
376+
cookies: typing.Optional[CookieTypes] = None,
377+
auth: typing.Optional[AuthTypes] = None,
378+
proxies: typing.Optional[ProxiesTypes] = None,
379379
follow_redirects: bool = False,
380-
cert: CertTypes = None,
380+
cert: typing.Optional[CertTypes] = None,
381381
verify: VerifyTypes = True,
382382
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
383383
trust_env: bool = True,
@@ -410,13 +410,13 @@ def patch(
410410
def delete(
411411
url: URLTypes,
412412
*,
413-
params: QueryParamTypes = None,
414-
headers: HeaderTypes = None,
415-
cookies: CookieTypes = None,
416-
auth: AuthTypes = None,
417-
proxies: ProxiesTypes = None,
413+
params: typing.Optional[QueryParamTypes] = None,
414+
headers: typing.Optional[HeaderTypes] = None,
415+
cookies: typing.Optional[CookieTypes] = None,
416+
auth: typing.Optional[AuthTypes] = None,
417+
proxies: typing.Optional[ProxiesTypes] = None,
418418
follow_redirects: bool = False,
419-
cert: CertTypes = None,
419+
cert: typing.Optional[CertTypes] = None,
420420
verify: VerifyTypes = True,
421421
timeout: TimeoutTypes = DEFAULT_TIMEOUT_CONFIG,
422422
trust_env: bool = True,

0 commit comments

Comments
 (0)