diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2022-10-16 18:30:44 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2022-10-16 18:34:25 -0400 |
| commit | f2056ca03f187abd0840093bb5409a449d0e18f6 (patch) | |
| tree | a092987f01ec49ea69d47be75b5b3edb609c763a /lib/sqlalchemy/orm | |
| parent | 7fd8898b10669c8e6b08c5d66c92bdc975aaa353 (diff) | |
| download | sqlalchemy-f2056ca03f187abd0840093bb5409a449d0e18f6.tar.gz | |
repair type qualify in _ServerDefaultType; other pyright tweaks
as we haven't done full pylance / pyright strict typing internally,
some of the things pyright reports on specifically will leak
out into user code, such as this mapped_column() issue.
So we will have to look more closely at pyright strict
mode going forward for the release.
Fixed typing issue where pylance strict mode would report "partially
unknown" datatype for the :func:`_orm.mapped_column` construct.
Also repaired a trailing comma and pyright complaining about overloads
for orm.composite.
Fixes: #8644
Change-Id: Ia48dc5dbd56bbceeacee4f0daf9810bfdea3bee3
Diffstat (limited to 'lib/sqlalchemy/orm')
| -rw-r--r-- | lib/sqlalchemy/orm/_orm_constructors.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/base.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/_orm_constructors.py b/lib/sqlalchemy/orm/_orm_constructors.py index 38d984438..e27a29729 100644 --- a/lib/sqlalchemy/orm/_orm_constructors.py +++ b/lib/sqlalchemy/orm/_orm_constructors.py @@ -403,7 +403,7 @@ def column_property( @overload def composite( - _class_or_attr: Type[_CC], + _class_or_attr: _CompositeAttrType[Any], *attrs: _CompositeAttrType[Any], group: Optional[str] = None, deferred: bool = False, @@ -418,13 +418,13 @@ def composite( info: Optional[_InfoType] = None, doc: Optional[str] = None, **__kw: Any, -) -> Composite[_CC]: +) -> Composite[Any]: ... @overload def composite( - _class_or_attr: _CompositeAttrType[Any], + _class_or_attr: Type[_CC], *attrs: _CompositeAttrType[Any], group: Optional[str] = None, deferred: bool = False, @@ -439,7 +439,7 @@ def composite( info: Optional[_InfoType] = None, doc: Optional[str] = None, **__kw: Any, -) -> Composite[Any]: +) -> Composite[_CC]: ... diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py index 20a683d8c..e4a69a352 100644 --- a/lib/sqlalchemy/orm/base.py +++ b/lib/sqlalchemy/orm/base.py @@ -77,7 +77,7 @@ class LoaderCallableStatus(Enum): """ ATTR_EMPTY = 3 - """Symbol used internally to indicate an attribute had no callable.""", + """Symbol used internally to indicate an attribute had no callable.""" NO_VALUE = 4 """Symbol which may be placed as the 'previous' value of an attribute, |