32
32
33
33
34
34
# Type accepted for model_class argument
35
- _FSA_MC = t .TypeVar (
36
- "_FSA_MC " ,
35
+ _FSA_MCT = t .TypeVar (
36
+ "_FSA_MCT " ,
37
37
bound = t .Union [
38
- Model ,
38
+ type [ Model ] ,
39
39
sa_orm .DeclarativeMeta ,
40
- sa_orm .DeclarativeBase ,
41
- sa_orm .DeclarativeBaseNoMeta ,
40
+ type [ sa_orm .DeclarativeBase ] ,
41
+ type [ sa_orm .DeclarativeBaseNoMeta ] ,
42
42
],
43
43
)
44
44
@@ -49,7 +49,7 @@ class _FSAModel(Model):
49
49
50
50
51
51
def _get_2x_declarative_bases (
52
- model_class : t . Type [ _FSA_MC ] ,
52
+ model_class : _FSA_MCT ,
53
53
) -> list [t .Type [t .Union [sa_orm .DeclarativeBase , sa_orm .DeclarativeBaseNoMeta ]]]:
54
54
return [
55
55
b
@@ -168,7 +168,7 @@ def __init__(
168
168
metadata : sa .MetaData | None = None ,
169
169
session_options : dict [str , t .Any ] | None = None ,
170
170
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]
172
172
engine_options : dict [str , t .Any ] | None = None ,
173
173
add_models_to_shell : bool = True ,
174
174
disable_autonaming : bool = False ,
@@ -502,7 +502,7 @@ def __new__(
502
502
503
503
def _make_declarative_base (
504
504
self ,
505
- model_class : t . Type [ _FSA_MC ] ,
505
+ model_class : _FSA_MCT ,
506
506
disable_autonaming : bool = False ,
507
507
) -> t .Type [_FSAModel ]:
508
508
"""Create a SQLAlchemy declarative model class. The result is available as
@@ -540,7 +540,7 @@ def _make_declarative_base(
540
540
" Got: {}" .format (model_class .__bases__ )
541
541
)
542
542
elif len (declarative_bases ) == 1 :
543
- body = dict (model_class .__dict__ ) # type: ignore[arg-type]
543
+ body = dict (model_class .__dict__ )
544
544
body ["__fsa__" ] = self
545
545
mixin_classes = [BindMixin , NameMixin , Model ]
546
546
if disable_autonaming :
@@ -558,7 +558,7 @@ def _make_declarative_base(
558
558
metadata = metadata , cls = model_class , name = "Model" , metaclass = metaclass
559
559
)
560
560
else :
561
- model = model_class
561
+ model = model_class # type: ignore[assignment]
562
562
563
563
if None not in self .metadatas :
564
564
# Use the model's metadata as the default metadata.
0 commit comments