diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2014-07-06 17:17:59 -0400 |
|---|---|---|
| committer | mike bayer <mike_mp@zzzcomputing.com> | 2014-07-06 17:17:59 -0400 |
| commit | 7c29cff14d8f3dd5ecfb39fdeb8d6a161333d722 (patch) | |
| tree | 60f1d6f3ae61006c3769b3bd9caf20aa6ca2fc48 | |
| parent | 961ede05109e3f26ee392e6971f84e9625ca3638 (diff) | |
| parent | 68a72ee0c4a0769d4233baa25f39a393edf70247 (diff) | |
| download | sqlalchemy-7c29cff14d8f3dd5ecfb39fdeb8d6a161333d722.tar.gz | |
Merge pull request #100 from plaes/typos
Typo fixes
| -rw-r--r-- | doc/build/dialects/postgresql.rst | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/events.py | 2 | ||||
| -rw-r--r-- | test/engine/test_transaction.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/build/dialects/postgresql.rst b/doc/build/dialects/postgresql.rst index 15b1fff9f..bde90c6bf 100644 --- a/doc/build/dialects/postgresql.rst +++ b/doc/build/dialects/postgresql.rst @@ -94,7 +94,7 @@ construction arguments, are as follows: Range Types ~~~~~~~~~~~ -The new range column types founds in PostgreSQL 9.2 onwards are +The new range column types found in PostgreSQL 9.2 onwards are catered for by the following types: .. autoclass:: INT4RANGE 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..f9744444d 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 the TLEngine directly.""" external_connection = tlengine.connect() self.assert_(external_connection.connection |