diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-29 18:38:44 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-11-29 18:38:44 -0500 |
| commit | 79fc3cdc1b0be99e138580905290823463766944 (patch) | |
| tree | 0b840795f76853d01be832a6cd851d2026cb3cc7 /lib/sqlalchemy/orm/unitofwork.py | |
| parent | 35bfda533ed1546f40a5907dfe87c14c0b71cd0d (diff) | |
| download | sqlalchemy-79fc3cdc1b0be99e138580905290823463766944.tar.gz | |
- use class name by itself in flush warnings to prevent overflow of warnings registry
- test suite swaps out warnings.warn with warnings.warn_explicit, to solve warnings registry issue
- explicitly disallow functions from inside test.bootstrap, test.lib being interpreted as tests
Diffstat (limited to 'lib/sqlalchemy/orm/unitofwork.py')
| -rw-r--r-- | lib/sqlalchemy/orm/unitofwork.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/unitofwork.py b/lib/sqlalchemy/orm/unitofwork.py index 8f7475c4b..db20acb90 100644 --- a/lib/sqlalchemy/orm/unitofwork.py +++ b/lib/sqlalchemy/orm/unitofwork.py @@ -180,9 +180,9 @@ class UOWTransaction(object): operation=None, prop=None): if not self.session._contains_state(state): if not state.deleted and operation is not None: - util.warn("Object %s not in session, %s operation " + util.warn("Object of type %s not in session, %s operation " "along '%s' will not proceed" % - (mapperutil.state_str(state), operation, prop)) + (mapperutil.state_class_str(state), operation, prop)) return False if state not in self.states: |