diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/interfaces.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/result.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/indexable.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/query.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/pool.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/ddl.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/dml.py | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 83facbf1f..f107578b2 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -222,7 +222,7 @@ class Connection(Connectable): :param isolation_level: Available on: :class:`.Connection`. Set the transaction isolation level for the lifespan of this :class:`.Connection` object (*not* the - underyling DBAPI connection, for which the level is reset + underlying DBAPI connection, for which the level is reset to its original setting upon termination of this :class:`.Connection` object). @@ -499,7 +499,7 @@ class Connection(Connectable): :meth:`.Connection.execute` method or similar), this :class:`.Connection` will attempt to procure a new DBAPI connection using the services of the - :class:`.Pool` as a source of connectivty (e.g. a "reconnection"). + :class:`.Pool` as a source of connectivity (e.g. a "reconnection"). If a transaction was in progress (e.g. the :meth:`.Connection.begin` method has been called) when diff --git a/lib/sqlalchemy/engine/interfaces.py b/lib/sqlalchemy/engine/interfaces.py index 082661216..2560937ab 100644 --- a/lib/sqlalchemy/engine/interfaces.py +++ b/lib/sqlalchemy/engine/interfaces.py @@ -634,7 +634,7 @@ class Dialect(object): raise NotImplementedError() def do_recover_twophase(self, connection): - """Recover list of uncommited prepared two phase transaction + """Recover list of uncommitted prepared two phase transaction identifiers on the given connection. :param connection: a :class:`.Connection`. diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index 8e5d79968..4b2c04755 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -837,7 +837,7 @@ class ResultProxy(object): In the case of a result that is the product of :ref:`connectionless execution <dbengine_implicit>`, - the underyling :class:`.Connection` object is also closed, which + the underlying :class:`.Connection` object is also closed, which :term:`releases` DBAPI connection resources. After this method is called, it is no longer valid to call upon @@ -1134,7 +1134,7 @@ class ResultProxy(object): discarded. Calls to :meth:`.ResultProxy.fetchmany` after all rows have been - exhuasted will return + exhausted will return an empty list. After the :meth:`.ResultProxy.close` method is called, the method will raise :class:`.ResourceClosedError`. diff --git a/lib/sqlalchemy/ext/indexable.py b/lib/sqlalchemy/ext/indexable.py index d0495fe5f..52a502ae4 100644 --- a/lib/sqlalchemy/ext/indexable.py +++ b/lib/sqlalchemy/ext/indexable.py @@ -159,7 +159,7 @@ data structure does not exist, and a set operation is called: the default data structure will be a Python list of ``None`` values, at least as long as the index value; the value is then set at its place in the list. This means for an index value of zero, the list - will be initalized to ``[None]`` before setting the given value, + will be initialized to ``[None]`` before setting the given value, and for an index value of five, the list will be initialized to ``[None, None, None, None, None]`` before setting the fifth element to the given value. Note that an existing list is **not** extended diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index cb712c94b..e6416d173 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -3078,7 +3078,7 @@ class Query(object): deletes are not supported by SQL** as well as that the **join condition of an inheritance mapper is not automatically rendered**. Care must be taken in any - multiple-table delete to first accomodate via some other means + multiple-table delete to first accommodate via some other means how the related table will be deleted, as well as to explicitly include the joining condition between those tables, even in mappings where diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py index 09ffaca2a..79feff7d9 100644 --- a/lib/sqlalchemy/pool.py +++ b/lib/sqlalchemy/pool.py @@ -134,7 +134,7 @@ class Pool(log.Identified): returned yet. Offers a slight performance advantage at the cost of individual transactions by default. The :meth:`.Pool.unique_connection` method is provided to return - a consistenty unique connection to bypass this behavior + a consistently unique connection to bypass this behavior when the flag is set. .. warning:: The :paramref:`.Pool.use_threadlocal` flag diff --git a/lib/sqlalchemy/sql/ddl.py b/lib/sqlalchemy/sql/ddl.py index 48f27b8b8..a48dec46f 100644 --- a/lib/sqlalchemy/sql/ddl.py +++ b/lib/sqlalchemy/sql/ddl.py @@ -1007,7 +1007,7 @@ def sort_tables_and_constraints( ``(Table, [ForeignKeyConstraint, ...])`` such that each :class:`.Table` follows its dependent :class:`.Table` objects. Remaining :class:`.ForeignKeyConstraint` objects that are separate due to - dependency rules not satisifed by the sort are emitted afterwards + dependency rules not satisfied by the sort are emitted afterwards as ``(None, [ForeignKeyConstraint ...])``. Tables are dependent on another based on the presence of diff --git a/lib/sqlalchemy/sql/dml.py b/lib/sqlalchemy/sql/dml.py index 31e4d3d9c..480b5ba7f 100644 --- a/lib/sqlalchemy/sql/dml.py +++ b/lib/sqlalchemy/sql/dml.py @@ -372,7 +372,7 @@ class ValuesBase(UpdateBase): if self._has_multi_parameters: raise exc.ArgumentError( "Can't pass kwargs and multiple parameter sets " - "simultaenously") + "simultaneously") else: self.parameters.update(kwargs) |