diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2023-04-10 17:56:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2023-04-10 17:56:30 +0000 |
| commit | a083c483e745e4d487af87a8eb8cfde7f8217d07 (patch) | |
| tree | 9df5d9125b156ca4cdc083c5c146a43474f0ba1d /lib/sqlalchemy | |
| parent | 5b1608992a8d64a8eff5005ff18adc9f5714a866 (diff) | |
| parent | bf51ff3248d1c87cbc7a846e2e6886339d59b9cb (diff) | |
| download | sqlalchemy-a083c483e745e4d487af87a8eb8cfde7f8217d07.tar.gz | |
Merge "include declared_directive as a declared_attr" into main
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/decl_base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/decl_base.py b/lib/sqlalchemy/orm/decl_base.py index bd62c3c1b..beede0ddb 100644 --- a/lib/sqlalchemy/orm/decl_base.py +++ b/lib/sqlalchemy/orm/decl_base.py @@ -260,9 +260,9 @@ def _mapper( @util.preload_module("sqlalchemy.orm.decl_api") def _is_declarative_props(obj: Any) -> bool: - declared_attr = util.preloaded.orm_decl_api.declared_attr + _declared_attr_common = util.preloaded.orm_decl_api._declared_attr_common - return isinstance(obj, (declared_attr, util.classproperty)) + return isinstance(obj, (_declared_attr_common, util.classproperty)) def _check_declared_props_nocascade( |