diff options
| author | Hajime Nakagami <nakagami@gmail.com> | 2013-04-20 17:10:23 +0900 |
|---|---|---|
| committer | Hajime Nakagami <nakagami@gmail.com> | 2013-04-20 17:10:23 +0900 |
| commit | fbcdba12f88d88c509fc34eb8aab3f501d1b705b (patch) | |
| tree | f1ca2029cfd147478447d3cb98bae587a8ccb3c2 /lib/sqlalchemy/orm/mapper.py | |
| parent | af9ed1ff16fce148af46fbff33286fc30e33773d (diff) | |
| parent | 7f0ee900b6c35a9bff214f9ebb02c3fb98d1f7e1 (diff) | |
| download | sqlalchemy-fbcdba12f88d88c509fc34eb8aab3f501d1b705b.tar.gz | |
merge from default
Diffstat (limited to 'lib/sqlalchemy/orm/mapper.py')
| -rw-r--r-- | lib/sqlalchemy/orm/mapper.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index 914c29b7f..c08d91b57 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -761,8 +761,9 @@ class Mapper(_InspectionAttr): del self._configure_failed if not self.non_primary and \ + self.class_manager is not None and \ self.class_manager.is_mapped and \ - self.class_manager.mapper is self: + self.class_manager.mapper is self: instrumentation.unregister_class(self.class_) def _configure_pks(self): |