Skip to content

Commit b319787

Browse files
zzzeekzzzeek
committed
update for mypy 17
Change-Id: I25708115b44bf46d22a2a81fe010db875a8bcb22
1 parent 45a5c31 commit b319787

12 files changed

Lines changed: 29 additions & 29 deletions

File tree

‎lib/sqlalchemy/orm/decl_base.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,9 +1204,9 @@ def _apply_dataclasses_to_any_class(
12041204
restored = None
12051205

12061206
try:
1207-
dataclass_callable(
1207+
dataclass_callable( # type: ignore[call-overload]
12081208
klass,
1209-
**{
1209+
**{ # type: ignore[call-overload,unused-ignore]
12101210
k: v
12111211
for k, v in dataclass_setup_arguments.items()
12121212
if v is not _NoArg.NO_ARG

‎lib/sqlalchemy/sql/schema.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5734,7 +5734,7 @@ def __setstate__(self, state: Dict[str, Any]) -> None:
57345734
def clear(self) -> None:
57355735
"""Clear all Table objects from this MetaData."""
57365736

5737-
dict.clear(self.tables) # type: ignore
5737+
dict.clear(self.tables)
57385738
self._schemas.clear()
57395739
self._fk_memos.clear()
57405740

‎lib/sqlalchemy/sql/util.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ def replace(
11741174
# we are an alias of a table and we are not derived from an
11751175
# alias of a table (which nonetheless may be the same table
11761176
# as ours) so, same thing
1177-
return col # type: ignore
1177+
return col
11781178
else:
11791179
# other cases where we are a selectable and the element
11801180
# is another join or selectable that contains a table which our

‎lib/sqlalchemy/util/_collections_cy.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def discard(self, element: _T, /) -> None:
139139
self._list.remove(element)
140140

141141
def clear(self) -> None:
142-
set.clear(self) # type: ignore[arg-type]
142+
set.clear(self)
143143
self._list = []
144144

145145
def __getitem__(self, key: cython.Py_ssize_t) -> _T:

‎test/typing/plain_files/engine/engine_result.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ def row_one(row: Row[int, str, bool]) -> None:
3131
def result_one(res: Result[int, str]) -> None:
3232
# EXPECTED_ROW_TYPE: Row[int, str]
3333
reveal_type(res.one())
34-
# EXPECTED_ROW_TYPE: Optional[Row[int, str]]
34+
# EXPECTED_ROW_TYPE: Row[int, str] | None
3535
reveal_type(res.one_or_none())
36-
# EXPECTED_ROW_TYPE: Optional[Row[int, str]]
36+
# EXPECTED_ROW_TYPE: Row[int, str] | None
3737
reveal_type(res.fetchone())
38-
# EXPECTED_ROW_TYPE: Optional[Row[int, str]]
38+
# EXPECTED_ROW_TYPE: Row[int, str] | None
3939
reveal_type(res.first())
4040
# EXPECTED_ROW_TYPE: Sequence[Row[int, str]]
4141
reveal_type(res.all())
@@ -67,7 +67,7 @@ def result_one(res: Result[int, str]) -> None:
6767

6868
# EXPECTED_TYPE: int
6969
reveal_type(res.scalar_one())
70-
# EXPECTED_TYPE: Union[int, None]
70+
# EXPECTED_TYPE: int | None
7171
reveal_type(res.scalar_one_or_none())
72-
# EXPECTED_TYPE: Union[int, None]
72+
# EXPECTED_TYPE: int | None
7373
reveal_type(res.scalar())

‎test/typing/plain_files/orm/dataclass_transforms_one.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class TestInitialSupport(Base):
2828
# EXPECTED_TYPE: str
2929
reveal_type(tis.data)
3030

31-
# EXPECTED_RE_TYPE: .*Union\[builtins.int, None\]
31+
# EXPECTED_RE_TYPE: .*builtins.int \| None
3232
reveal_type(tis.y)
3333

3434
tis.data = "some other data"

‎test/typing/plain_files/orm/relationship.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ class Engineer(Employee):
131131

132132

133133
if typing.TYPE_CHECKING:
134-
# EXPECTED_RE_TYPE: sqlalchemy.*.InstrumentedAttribute\[Union\[builtins.str, None\]\]
134+
# EXPECTED_RE_TYPE: sqlalchemy.*.InstrumentedAttribute\[builtins.str \| None\]
135135
reveal_type(User.extra)
136136

137-
# EXPECTED_RE_TYPE: sqlalchemy.*.InstrumentedAttribute\[Union\[builtins.str, None\]\]
137+
# EXPECTED_RE_TYPE: sqlalchemy.*.InstrumentedAttribute\[builtins.str \| None\]
138138
reveal_type(User.extra_name)
139139

140140
# EXPECTED_RE_TYPE: sqlalchemy.*.InstrumentedAttribute\[builtins.str\*?\]

‎test/typing/plain_files/sql/misc.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ def test_col_get() -> None:
2727
col_alt = column("alt", Integer)
2828
tbl = table("mytable", col_id)
2929

30-
# EXPECTED_TYPE: Union[ColumnClause[Any], None]
30+
# EXPECTED_TYPE: ColumnClause[Any] | None
3131
reveal_type(tbl.c.get("id"))
32-
# EXPECTED_TYPE: Union[ColumnClause[Any], None]
32+
# EXPECTED_TYPE: ColumnClause[Any] | None
3333
reveal_type(tbl.c.get("id", None))
34-
# EXPECTED_TYPE: Union[ColumnClause[Any], ColumnClause[int]]
34+
# EXPECTED_TYPE: ColumnClause[Any] | ColumnClause[int]
3535
reveal_type(tbl.c.get("alt", col_alt))
3636
col: ColumnElement[Any] = tbl.c.get("foo", literal("bar"))
3737
print(col)

‎test/typing/plain_files/sql/operators.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,5 +157,5 @@ class A(Base):
157157

158158
# EXPECTED_TYPE: BinaryExpression[Any]
159159
reveal_type(col.op("->>")("field"))
160-
# EXPECTED_TYPE: Union[BinaryExpression[Any], Grouping[Any]]
160+
# EXPECTED_TYPE: BinaryExpression[Any] | Grouping[Any]
161161
reveal_type(col.op("->>")("field").self_group())

‎test/typing/plain_files/sql/sql_operations.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def test_issue_9650_bitwise() -> None:
133133
# EXPECTED_RE_TYPE: sqlalchemy..*BinaryExpression\[builtins.bool\]
134134
reveal_type(expr2)
135135

136-
# EXPECTED_RE_TYPE: sqlalchemy..*ColumnElement\[Union\[builtins.float, .*\.Decimal\]\]
136+
# EXPECTED_RE_TYPE: sqlalchemy..*ColumnElement\[builtins.float | .*\.Decimal\]
137137
reveal_type(expr3)
138138

139139
# EXPECTED_RE_TYPE: sqlalchemy..*UnaryExpression\[builtins.int.?\]

0 commit comments

Comments
 (0)