diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2018-10-01 21:37:49 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci.zzzcomputing.com> | 2018-10-01 21:37:49 -0400 |
| commit | acebd2df114c9d4f0ac226fbc2e7139fb9218251 (patch) | |
| tree | 016f9b955d03ea25805391205cd3ebe1ceb4af44 /lib/sqlalchemy | |
| parent | 76963dc49cca5d04f1bdc61e3423bab0b81244d6 (diff) | |
| parent | b171a2ed0351aff755c34ca9cf51e8e33c2df95e (diff) | |
| download | sqlalchemy-acebd2df114c9d4f0ac226fbc2e7139fb9218251.tar.gz | |
Merge "Add .info to InstanceState"
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/state.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py index 03d68ab82..935e7df19 100644 --- a/lib/sqlalchemy/orm/state.py +++ b/lib/sqlalchemy/orm/state.py @@ -24,7 +24,7 @@ from . import base @inspection._self_inspects -class InstanceState(interfaces.InspectionAttr): +class InstanceState(interfaces.InspectionAttrInfo): """tracks state information at the instance level. The :class:`.InstanceState` is a key object used by the @@ -440,7 +440,7 @@ class InstanceState(interfaces.InspectionAttr): (k, self.__dict__[k]) for k in ( 'committed_state', '_pending_mutations', 'modified', 'expired', 'callables', 'key', 'parents', 'load_options', - 'class_', 'expired_attributes' + 'class_', 'expired_attributes', 'info' ) if k in self.__dict__ ) if self.load_path: @@ -467,6 +467,8 @@ class InstanceState(interfaces.InspectionAttr): self.parents = state_dict.get('parents', {}) self.modified = state_dict.get('modified', False) self.expired = state_dict.get('expired', False) + if 'info' in state_dict: + self.info.update(state_dict['info']) if 'callables' in state_dict: self.callables = state_dict['callables'] |