diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-02-18 13:49:12 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-02-18 13:49:12 -0500 |
| commit | 99b535bbd1dab7bd2dcbc61dedec127641b1be2e (patch) | |
| tree | 1a737bbd3d38a881bed83ebb7bc5223eb95089c7 | |
| parent | ba110176c97829c5cc886f4092af560613690d80 (diff) | |
| download | sqlalchemy-99b535bbd1dab7bd2dcbc61dedec127641b1be2e.tar.gz | |
- inline the .reset calls
| -rw-r--r-- | lib/sqlalchemy/orm/state.py | 3 | ||||
| -rw-r--r-- | test/profiles.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/state.py b/lib/sqlalchemy/orm/state.py index acda22c22..4d7bd539c 100644 --- a/lib/sqlalchemy/orm/state.py +++ b/lib/sqlalchemy/orm/state.py @@ -254,7 +254,8 @@ class InstanceState(interfaces.InspectionAttr): if instance_dict is not None: instance_dict.discard(self) - InstanceState.callables._reset(self) + if 'callables' in self.__dict__: + self.__dict__.pop('callables') self.session_id = self._strong_obj = None del self.obj diff --git a/test/profiles.txt b/test/profiles.txt index 203d4fdcb..84b7f8f15 100644 --- a/test/profiles.txt +++ b/test/profiles.txt @@ -233,7 +233,7 @@ test.aaa_profiling.test_orm.MergeTest.test_merge_no_load 3.4_postgresql_psycopg2 # TEST: test.aaa_profiling.test_orm.SessionTest.test_expire_lots -test.aaa_profiling.test_orm.SessionTest.test_expire_lots 2.7_sqlite_pysqlite_cextensions 1768 +test.aaa_profiling.test_orm.SessionTest.test_expire_lots 2.7_sqlite_pysqlite_cextensions 1454 # TEST: test.aaa_profiling.test_pool.QueuePoolTest.test_first_connect |