From: Priit Laes <plaes@plaes.org>
Date: Sat, 28 Jun 2014 09:46:46 +0000 (+0300)
Subject: typo: s/tranasction/transaction
X-Git-Tag: rel_0_9_7~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4467ded1e340f9272c256b4ce50b4e1a12eeb999;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

typo: s/tranasction/transaction

Conflicts:
	test/engine/test_transaction.py
---

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