summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPriit Laes <plaes@plaes.org>2014-06-28 12:46:46 +0300
committerPriit Laes <plaes@plaes.org>2014-06-28 12:46:46 +0300
commiteb5f398a01db4e1df615eb7a5d01187122e47f26 (patch)
tree613469cd015161ace38b8af8ecbd2036af7eb161
parent8c337099852333d6c3587b35168af9b1af171487 (diff)
downloadsqlalchemy-eb5f398a01db4e1df615eb7a5d01187122e47f26.tar.gz
typo: s/tranasction/transaction
-rw-r--r--lib/sqlalchemy/orm/events.py2
-rw-r--r--test/engine/test_transaction.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/events.py b/lib/sqlalchemy/orm/events.py
index e64cb8c92..2656abfca 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 ee626a50e..14f3095e9 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
@@ -988,7 +988,7 @@ class TLTransactionTest(fixtures.TestBase):
def test_more_mixed_nesting(self):
"""tests nesting of transactions off the connection from the
- TLEngine inside of tranasctions off thbe TLEngine directly."""
+ TLEngine inside of transactions off thbe TLEngine directly."""
external_connection = tlengine.connect()
self.assert_(external_connection.connection