diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2017-03-27 12:27:56 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@awstats.zzzcomputing.com> | 2017-03-27 12:27:56 -0400 |
| commit | 6eae79ac55ea2b25270758ed72f1a08e7f54980e (patch) | |
| tree | 4d99b411a29368d6abc0a1ddf137cc89302f42fe /lib/sqlalchemy/engine/base.py | |
| parent | ecf85cb083c6dd92cf845b703a8aa79d4a445267 (diff) | |
| parent | c0a224aba3d4e2a41f92a29f9d18c6cb9d09d61f (diff) | |
| download | sqlalchemy-6eae79ac55ea2b25270758ed72f1a08e7f54980e.tar.gz | |
Merge "Add safe_reraise() + warnings only to Connection._autorollback"
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 0334d2d7a..f680edada 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1383,7 +1383,8 @@ class Connection(Connectable): if not self._is_disconnect: if cursor: self._safe_close_cursor(cursor) - self._autorollback() + with util.safe_reraise(warn_only=True): + self._autorollback() if newraise: util.raise_from_cause(newraise, exc_info) |