Skip to content

Commit fe9e4de

Browse files
committed
Make suggested typing fix
1 parent cf4170a commit fe9e4de

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/flask_sqlalchemy/extension.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@
3232

3333

3434
# Type accepted for model_class argument
35-
_FSA_MC = t.TypeVar(
36-
"_FSA_MC",
35+
_FSA_MCT = t.TypeVar(
36+
"_FSA_MCT",
3737
bound=t.Union[
38-
Model,
38+
type[Model],
3939
sa_orm.DeclarativeMeta,
40-
sa_orm.DeclarativeBase,
41-
sa_orm.DeclarativeBaseNoMeta,
40+
type[sa_orm.DeclarativeBase],
41+
type[sa_orm.DeclarativeBaseNoMeta],
4242
],
4343
)
4444

@@ -49,7 +49,7 @@ class _FSAModel(Model):
4949

5050

5151
def _get_2x_declarative_bases(
52-
model_class: t.Type[_FSA_MC],
52+
model_class: _FSA_MCT,
5353
) -> list[t.Type[t.Union[sa_orm.DeclarativeBase, sa_orm.DeclarativeBaseNoMeta]]]:
5454
return [
5555
b
@@ -168,7 +168,7 @@ def __init__(
168168
metadata: sa.MetaData | None = None,
169169
session_options: dict[str, t.Any] | None = None,
170170
query_class: type[Query] = Query,
171-
model_class: t.Type[_FSA_MC] = Model, # type: ignore[assignment]
171+
model_class: _FSA_MCT = Model, # type: ignore[assignment]
172172
engine_options: dict[str, t.Any] | None = None,
173173
add_models_to_shell: bool = True,
174174
disable_autonaming: bool = False,
@@ -502,7 +502,7 @@ def __new__(
502502

503503
def _make_declarative_base(
504504
self,
505-
model_class: t.Type[_FSA_MC],
505+
model_class: _FSA_MCT,
506506
disable_autonaming: bool = False,
507507
) -> t.Type[_FSAModel]:
508508
"""Create a SQLAlchemy declarative model class. The result is available as
@@ -540,7 +540,7 @@ def _make_declarative_base(
540540
" Got: {}".format(model_class.__bases__)
541541
)
542542
elif len(declarative_bases) == 1:
543-
body = dict(model_class.__dict__) # type: ignore[arg-type]
543+
body = dict(model_class.__dict__)
544544
body["__fsa__"] = self
545545
mixin_classes = [BindMixin, NameMixin, Model]
546546
if disable_autonaming:
@@ -558,7 +558,7 @@ def _make_declarative_base(
558558
metadata=metadata, cls=model_class, name="Model", metaclass=metaclass
559559
)
560560
else:
561-
model = model_class
561+
model = model_class # type: ignore[assignment]
562562

563563
if None not in self.metadatas:
564564
# Use the model's metadata as the default metadata.

0 commit comments

Comments
 (0)