diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2018-03-21 14:15:46 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci.zzzcomputing.com> | 2018-03-21 14:15:46 -0400 |
| commit | dfb16b4493aeecc339a0433b310b8f6a32887656 (patch) | |
| tree | cf5c972732017135408b5b87f31ca045e0762f4c /lib/sqlalchemy | |
| parent | 5cc8d872b47e0430daecb93e23f6206319ba052d (diff) | |
| parent | 37955a52995cdbb66a9d5835c20ee58fb98ddffc (diff) | |
| download | sqlalchemy-dfb16b4493aeecc339a0433b310b8f6a32887656.tar.gz | |
Merge "Don't warn for mixin-based __table_args__, __mapper_args__ declared_attr"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/api.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py index 77a03bc4a..b08d3ce30 100644 --- a/lib/sqlalchemy/ext/declarative/api.py +++ b/lib/sqlalchemy/ext/declarative/api.py @@ -17,6 +17,7 @@ from ...util import OrderedDict, hybridmethod, hybridproperty from ... import util from ... import exc import weakref +import re from .base import _as_declarative, \ _declarative_constructor,\ @@ -189,8 +190,8 @@ class declared_attr(interfaces._MappedAttribute, property): def __get__(desc, self, cls): reg = cls.__dict__.get('_sa_declared_attr_reg', None) if reg is None: - manager = attributes.manager_of_class(cls) - if manager is None: + if not re.match(r'^__.+__$', desc.fget.__name__) and \ + attributes.manager_of_class(cls) is None: util.warn( "Unmanaged access of declarative attribute %s from " "non-mapped class %s" % |