diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-08 18:36:57 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-08 18:36:57 -0400 |
| commit | 22570c3181ef4e98c548c2f6254a0c7585568f06 (patch) | |
| tree | 471bc4670f0ac40c789a075f8797387ffb749041 /lib/sqlalchemy/ext/declarative/base.py | |
| parent | a2e7b4c5fa71b95829e6d954f958bd91b4fd67e5 (diff) | |
| download | sqlalchemy-22570c3181ef4e98c548c2f6254a0c7585568f06.tar.gz | |
Protect against cls weakref becoming None
Protected against testing "None" as a class in the case where
declarative classes are being garbage collected and new
automap prepare() operations are taking place concurrently, very
infrequently hitting a weakref that has not been fully acted upon
after gc.
Change-Id: I32e1dfc5ac46bac4127fe808cfd18368e2fad9dd
Diffstat (limited to 'lib/sqlalchemy/ext/declarative/base.py')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/base.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py index 3beee3191..95f02ea96 100644 --- a/lib/sqlalchemy/ext/declarative/base.py +++ b/lib/sqlalchemy/ext/declarative/base.py @@ -568,8 +568,12 @@ class _DeferredMapperConfig(_MapperConfig): @classmethod def classes_for_base(cls, base_cls, sort=True): - classes_for_base = [m for m in cls._configs.values() - if issubclass(m.cls, base_cls)] + classes_for_base = [ + m for m, cls_ in + [(m, m.cls) for m in cls._configs.values()] + if cls_ is not None and issubclass(cls_, base_cls) + ] + if not sort: return classes_for_base |