diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-05-19 17:43:54 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-05-19 17:43:54 -0400 |
| commit | 665eced208b9e277f4b5cdb64f5ef0613938e11a (patch) | |
| tree | 6a288a531fe928e0f910ab2a56f37fbef7bc7b90 /lib/sqlalchemy/orm/instrumentation.py | |
| parent | fd57a4116301c91a651e397f65235bc6a766a39d (diff) | |
| download | sqlalchemy-665eced208b9e277f4b5cdb64f5ef0613938e11a.tar.gz | |
inlining
Diffstat (limited to 'lib/sqlalchemy/orm/instrumentation.py')
| -rw-r--r-- | lib/sqlalchemy/orm/instrumentation.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/instrumentation.py b/lib/sqlalchemy/orm/instrumentation.py index 68b4f0611..7699e0578 100644 --- a/lib/sqlalchemy/orm/instrumentation.py +++ b/lib/sqlalchemy/orm/instrumentation.py @@ -288,12 +288,14 @@ class ClassManager(dict): def new_instance(self, state=None): instance = self.class_.__new__(self.class_) setattr(instance, self.STATE_ATTR, - state or self._state_constructor(instance, self)) + self._state_constructor(instance, self) + if not state else state) return instance def setup_instance(self, instance, state=None): setattr(instance, self.STATE_ATTR, - state or self._state_constructor(instance, self)) + self._state_constructor(instance, self) + if not state else state) def teardown_instance(self, instance): delattr(instance, self.STATE_ATTR) |