summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/future/engine.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/future/engine.py')
-rw-r--r--lib/sqlalchemy/future/engine.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/sqlalchemy/future/engine.py b/lib/sqlalchemy/future/engine.py
index cee17a432..ab890ca4f 100644
--- a/lib/sqlalchemy/future/engine.py
+++ b/lib/sqlalchemy/future/engine.py
@@ -359,16 +359,12 @@ class Engine(_LegacyEngine):
def __enter__(self):
self.transaction = self.conn.begin()
+ self.transaction.__enter__()
return self.conn
def __exit__(self, type_, value, traceback):
try:
- if type_ is not None:
- if self.transaction.is_active:
- self.transaction.rollback()
- else:
- if self.transaction.is_active:
- self.transaction.commit()
+ self.transaction.__exit__(type_, value, traceback)
finally:
self.conn.close()