From 4467ded1e340f9272c256b4ce50b4e1a12eeb999 Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Sat, 28 Jun 2014 12:46:46 +0300 Subject: [PATCH] typo: s/tranasction/transaction Conflicts: test/engine/test_transaction.py --- lib/sqlalchemy/orm/events.py | 2 +- test/engine/test_transaction.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py index e64cb8c92a..2656abfca9 100644 --- a/lib/sqlalchemy/orm/events.py +++ b/lib/sqlalchemy/orm/events.py @@ -1315,7 +1315,7 @@ class SessionEvents(event.Events): .. note:: - The :class:`.Session` is not in an active tranasction + The :class:`.Session` is not in an active transaction when the :meth:`~.SessionEvents.after_commit` event is invoked, and therefore can not emit SQL. To emit SQL corresponding to every transaction, use the :meth:`~.SessionEvents.before_commit` event. diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py index 566cc62986..f9744444d2 100644 --- a/test/engine/test_transaction.py +++ b/test/engine/test_transaction.py @@ -956,7 +956,7 @@ class TLTransactionTest(fixtures.TestBase): def test_mixed_nesting(self): """tests nesting of transactions off the TLEngine directly - inside of tranasctions off the connection from the TLEngine""" + inside of transactions off the connection from the TLEngine""" external_connection = tlengine.connect() self.assert_(external_connection.connection -- 2.47.3