Skip to content

Commit 985f27d

Browse files
Bump mypy from 1.19.1 to 1.20.2 (#12448)
Bumps [mypy](https://github.com/python/mypy) from 1.19.1 to 1.20.2. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/python/mypy/blob/master/CHANGELOG.md">mypy's changelog</a>.</em></p> <blockquote> <h3>Mypy 1.20.2</h3> <ul> <li>Use WAL with SQLite cache and fix close (Shantanu, PR <a href="https://redirect.github.com/python/mypy/pull/21154">21154</a>)</li> <li>Adjust SQLite journal mode (Ivan Levkivskyi, PR <a href="https://redirect.github.com/python/mypy/pull/21217">21217</a>)</li> <li>Correctly aggregate narrowing information on parent expressions (Shantanu, PR <a href="https://redirect.github.com/python/mypy/pull/21206">21206</a>)</li> <li>Fix regression related to generic callables (Shantanu, PR <a href="https://redirect.github.com/python/mypy/pull/21208">21208</a>)</li> <li>Fix regression by avoiding widening types in some contexts (Shantanu, PR <a href="https://redirect.github.com/python/mypy/pull/21242">21242</a>)</li> <li>Fix slicing in non-strict optional mode (Shantanu, PR <a href="https://redirect.github.com/python/mypy/pull/21282">21282</a>)</li> <li>mypyc: Fix match statement semantics for &quot;or&quot; pattern (Shantanu, PR <a href="https://redirect.github.com/python/mypy/pull/21156">21156</a>)</li> <li>mypyc: Fix issue with module dunder attributes (Piotr Sawicki, PR <a href="https://redirect.github.com/python/mypy/pull/21275">21275</a>)</li> <li>Initial support for Python 3.15.0a8 (Marc Mueller, PR <a href="https://redirect.github.com/python/mypy/pull/21255">21255</a>)</li> </ul> <h3>Acknowledgements</h3> <p>Thanks to all mypy contributors who contributed to this release:</p> <ul> <li>A5rocks</li> <li>Aaron Wieczorek</li> <li>Adam Turner</li> <li>Ali Hamdan</li> <li>asce</li> <li>BobTheBuidler</li> <li>Brent Westbrook</li> <li>Brian Schubert</li> <li>bzoracler</li> <li>Chris Burroughs</li> <li>Christoph Tyralla</li> <li>Colin Watson</li> <li>Donghoon Nam</li> <li>E. M. Bray</li> <li>Emma Smith</li> <li>Ethan Sarp</li> <li>George Ogden</li> <li>getzze</li> <li>grayjk</li> <li>Gregor Riepl</li> <li>Ivan Levkivskyi</li> <li>James Hilliard</li> <li>James Le Cuirot</li> <li>Jeremy Nimmer</li> <li>Joren Hammudoglu</li> <li>Kai (Kazuya Ito)</li> <li>kaushal trivedi</li> <li>Kevin Kannammalil</li> <li>Lukas Geiger</li> <li>Łukasz Langa</li> <li>Marc Mueller</li> <li>Michael R. Crusoe</li> <li>michaelm-openai</li> <li>Neil Schemenauer</li> <li>Piotr Sawicki</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/python/mypy/commit/145a062651b5f9996b75ef32b7040bd2e885ed82"><code>145a062</code></a> Bump version to 1.20.2</li> <li><a href="https://github.com/python/mypy/commit/81cd49215c288eacb987de066f02daff2553b7c7"><code>81cd492</code></a> Fix slicing with nonstrict optional (<a href="https://redirect.github.com/python/mypy/issues/21282">#21282</a>)</li> <li><a href="https://github.com/python/mypy/commit/908d3441eecbaa2a6193165317177db834d7ca1a"><code>908d344</code></a> [mypyc] Set dunder attrs when adding module to sys.modules (<a href="https://redirect.github.com/python/mypy/issues/21275">#21275</a>)</li> <li><a href="https://github.com/python/mypy/commit/ba28610fac9d2b33be210ca8dcfe4bc47b7af424"><code>ba28610</code></a> Initial support for Python 3.15.0a8 (<a href="https://redirect.github.com/python/mypy/issues/21255">#21255</a>)</li> <li><a href="https://github.com/python/mypy/commit/7b0e09f48dbd3717ed008a273cd17e8e960c2037"><code>7b0e09f</code></a> Fix match statement semantics for &quot;or&quot; pattern (<a href="https://redirect.github.com/python/mypy/issues/21156">#21156</a>)</li> <li><a href="https://github.com/python/mypy/commit/92b74f226de62f7505f5ef5cb158e8ec9c58b8b7"><code>92b74f2</code></a> Avoid widening types in conditional_types (<a href="https://redirect.github.com/python/mypy/issues/21242">#21242</a>)</li> <li><a href="https://github.com/python/mypy/commit/0dcbfaa40b0e360a16baea9cf851955375d91b54"><code>0dcbfaa</code></a> Fix is_overlapping_types for generic callables (<a href="https://redirect.github.com/python/mypy/issues/21208">#21208</a>)</li> <li><a href="https://github.com/python/mypy/commit/210f518dede35292033ef0d387847406a0ccef8f"><code>210f518</code></a> Correctly aggregate narrowing information on parent expressions (<a href="https://redirect.github.com/python/mypy/issues/21206">#21206</a>)</li> <li><a href="https://github.com/python/mypy/commit/c34530e53a10e385d8b0f1af4baa88a596b5ceaa"><code>c34530e</code></a> Only set journal mode in coordinator (<a href="https://redirect.github.com/python/mypy/issues/21217">#21217</a>)</li> <li><a href="https://github.com/python/mypy/commit/79a3ec6d01b56a27c00e9b3320c2b1d4d73a77f9"><code>79a3ec6</code></a> Use WAL with SQLite cache, fix close (<a href="https://redirect.github.com/python/mypy/issues/21154">#21154</a>)</li> <li>Additional commits viewable in <a href="https://github.com/python/mypy/compare/v1.19.1...v1.20.2">compare view</a></li> </ul> </details> <br /> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sam Bull <git@sambull.org>
1 parent 9506e32 commit 985f27d

8 files changed

Lines changed: 19 additions & 17 deletions

File tree

aiohttp/client_reqrep.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1054,7 +1054,7 @@ def update_headers(self, headers: LooseHeaders | None) -> None:
10541054
if isinstance(headers, (dict, MultiDictProxy, MultiDict)):
10551055
headers = headers.items()
10561056

1057-
for key, value in headers: # type: ignore[misc]
1057+
for key, value in headers: # type: ignore[str-unpack]
10581058
# A special case for Host header
10591059
if key in hdrs.HOST_ALL:
10601060
self.headers[key] = value

aiohttp/web_log.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
import os
55
import re
66
import time as time_mod
7-
from collections import namedtuple
87
from collections.abc import Iterable
9-
from typing import Callable, ClassVar
8+
from typing import Callable, ClassVar, NamedTuple
109

1110
from .abc import AbstractAccessLogger
1211
from .web_request import BaseRequest
1312
from .web_response import StreamResponse
1413

15-
KeyMethod = namedtuple("KeyMethod", "key method")
14+
15+
class KeyMethod(NamedTuple):
16+
key: str | tuple[str, str]
17+
method: Callable[[BaseRequest, StreamResponse, float], str]
1618

1719

1820
class AccessLogger(AbstractAccessLogger):
@@ -198,7 +200,7 @@ def _format_D(request: BaseRequest, response: StreamResponse, time: float) -> st
198200

199201
def _format_line(
200202
self, request: BaseRequest, response: StreamResponse, time: float
201-
) -> Iterable[tuple[str, Callable[[BaseRequest, StreamResponse, float], str]]]:
203+
) -> Iterable[tuple[str | tuple[str, str], str]]:
202204
return [(key, method(request, response, time)) for key, method in self._methods]
203205

204206
@property
@@ -212,17 +214,17 @@ def log(self, request: BaseRequest, response: StreamResponse, time: float) -> No
212214
fmt_info = self._format_line(request, response, time)
213215

214216
values = list()
215-
extra = dict()
217+
extra: dict[str, str | dict[str, str]] = dict()
216218
for key, value in fmt_info:
217219
values.append(value)
218220

219-
if key.__class__ is str:
221+
if isinstance(key, str):
220222
extra[key] = value
221223
else:
222-
k1, k2 = key # type: ignore[misc]
223-
dct = extra.get(k1, {}) # type: ignore[var-annotated,has-type]
224-
dct[k2] = value # type: ignore[index,has-type]
225-
extra[k1] = dct # type: ignore[has-type,assignment]
224+
k1, k2 = key
225+
dct: dict[str, str] = extra.get(k1, {}) # type: ignore[assignment]
226+
dct[k2] = value
227+
extra[k1] = dct
226228

227229
self.logger.info(self._log_format % tuple(values), extra=extra)
228230
except Exception:

requirements/constraints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ multidict==6.7.1
119119
# -r requirements/multidict.in
120120
# -r requirements/runtime-deps.in
121121
# yarl
122-
mypy==1.19.1 ; implementation_name == "cpython"
122+
mypy==1.20.2 ; implementation_name == "cpython"
123123
# via
124124
# -r requirements/lint.in
125125
# -r requirements/test-common.in

requirements/dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ multidict==6.7.1
116116
# via
117117
# -r requirements/runtime-deps.in
118118
# yarl
119-
mypy==1.19.1 ; implementation_name == "cpython"
119+
mypy==1.20.2 ; implementation_name == "cpython"
120120
# via
121121
# -r requirements/lint.in
122122
# -r requirements/test-common.in

requirements/lint.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ markdown-it-py==4.0.0
5151
# via rich
5252
mdurl==0.1.2
5353
# via markdown-it-py
54-
mypy==1.19.1 ; implementation_name == "cpython"
54+
mypy==1.20.2 ; implementation_name == "cpython"
5555
# via -r requirements/lint.in
5656
mypy-extensions==1.1.0
5757
# via mypy

requirements/test-common.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ markdown-it-py==4.0.0
4040
# via rich
4141
mdurl==0.1.2
4242
# via markdown-it-py
43-
mypy==1.19.1 ; implementation_name == "cpython"
43+
mypy==1.20.2 ; implementation_name == "cpython"
4444
# via -r requirements/test-common.in
4545
mypy-extensions==1.1.0
4646
# via mypy

requirements/test-ft.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ multidict==6.7.1
6767
# via
6868
# -r requirements/runtime-deps.in
6969
# yarl
70-
mypy==1.19.1 ; implementation_name == "cpython"
70+
mypy==1.20.2 ; implementation_name == "cpython"
7171
# via -r requirements/test-common.in
7272
mypy-extensions==1.1.0
7373
# via mypy

requirements/test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ multidict==6.7.1
6767
# via
6868
# -r requirements/runtime-deps.in
6969
# yarl
70-
mypy==1.19.1 ; implementation_name == "cpython"
70+
mypy==1.20.2 ; implementation_name == "cpython"
7171
# via -r requirements/test-common.in
7272
mypy-extensions==1.1.0
7373
# via mypy

0 commit comments

Comments
 (0)