summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiana Clarke <diana.joan.clarke@gmail.com>2012-03-17 22:07:10 -0400
committerDiana Clarke <diana.joan.clarke@gmail.com>2012-03-17 22:07:10 -0400
commit920afb6127b5ee7f0abc2147d52677176a27232c (patch)
tree3007384b496b6ef162463a306ba28d50a29787ba
parent87fc12cc12894440683a80509acca975d3924eea (diff)
downloadsqlalchemy-920afb6127b5ee7f0abc2147d52677176a27232c.tar.gz
typos in lib/sqlalchemy/engine
-rw-r--r--lib/sqlalchemy/engine/base.py16
-rw-r--r--lib/sqlalchemy/engine/default.py4
-rw-r--r--lib/sqlalchemy/engine/strategies.py6
3 files changed, 13 insertions, 13 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index d16fc9c68..1f28501f7 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -734,7 +734,7 @@ class Compiled(object):
def construct_params(self, params=None):
"""Return the bind params for this compiled object.
- :param params: a dict of string/object pairs whos values will
+ :param params: a dict of string/object pairs whose values will
override bind values compiled in to the
statement.
"""
@@ -978,10 +978,10 @@ class Connection(Connectable):
:ref:`postgresql_toplevel` - see those dialect's documentation
for further info.
- Note that this option necessarily affects the underying
+ Note that this option necessarily affects the underlying
DBAPI connection for the lifespan of the originating
:class:`.Connection`, and is not per-execution. This
- setting is not removed until the underying DBAPI connection
+ setting is not removed until the underlying DBAPI connection
is returned to the connection pool, i.e.
the :meth:`.Connection.close` method is called.
@@ -1074,7 +1074,7 @@ class Connection(Connectable):
"""Returns self.
This ``Connectable`` interface method returns self, allowing
- Connections to be used interchangably with Engines in most
+ Connections to be used interchangeably with Engines in most
situations that require a bind.
"""
@@ -1084,7 +1084,7 @@ class Connection(Connectable):
"""Returns self.
This ``Connectable`` interface method returns self, allowing
- Connections to be used interchangably with Engines in most
+ Connections to be used interchangeably with Engines in most
situations that require a bind.
"""
@@ -1123,7 +1123,7 @@ class Connection(Connectable):
def detach(self):
"""Detach the underlying DB-API connection from its connection pool.
- This Connection instance will remain useable. When closed,
+ This Connection instance will remain usable. When closed,
the DB-API connection will be literally closed and not
returned to its pool. The pool will typically lazily create a
new connection to replace the detached connection.
@@ -2130,7 +2130,7 @@ class Engine(Connectable, log.Identified):
:class:`~sqlalchemy.engine.base.Dialect` together to provide a source
of database connectivity and behavior.
- An :class:`.Engine` object is instantiated publically using the
+ An :class:`.Engine` object is instantiated publicly using the
:func:`~sqlalchemy.create_engine` function.
See also:
@@ -2178,7 +2178,7 @@ class Engine(Connectable, log.Identified):
The given keys/values in \**opt are added to the
default execution options that will be used for
all connections. The initial contents of this dictionary
- can be sent via the ``execution_options`` paramter
+ can be sent via the ``execution_options`` parameter
to :func:`.create_engine`.
See :meth:`.Connection.execution_options` for more
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 5c2d98146..d0cbe871f 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -264,7 +264,7 @@ class DefaultDialect(base.Dialect):
return insp.reflecttable(table, include_columns, exclude_columns)
def get_pk_constraint(self, conn, table_name, schema=None, **kw):
- """Compatiblity method, adapts the result of get_primary_keys()
+ """Compatibility method, adapts the result of get_primary_keys()
for those dialects which don't implement get_pk_constraint().
"""
@@ -341,7 +341,7 @@ class DefaultDialect(base.Dialect):
return False
def reset_isolation_level(self, dbapi_conn):
- # default_isolation_level is read from the first conenction
+ # default_isolation_level is read from the first connection
# after the initial set of 'isolation_level', if any, so is
# the configured default of this dialect.
self.set_isolation_level(dbapi_conn, self.default_isolation_level)
diff --git a/lib/sqlalchemy/engine/strategies.py b/lib/sqlalchemy/engine/strategies.py
index 4d5a4b342..a781cb451 100644
--- a/lib/sqlalchemy/engine/strategies.py
+++ b/lib/sqlalchemy/engine/strategies.py
@@ -24,7 +24,7 @@ strategies = {}
class EngineStrategy(object):
- """An adaptor that processes input arguements and produces an Engine.
+ """An adaptor that processes input arguments and produces an Engine.
Provides a ``create`` method that receives input arguments and
produces an instance of base.Engine or a subclass.
@@ -41,7 +41,7 @@ class EngineStrategy(object):
class DefaultEngineStrategy(EngineStrategy):
- """Base class for built-in stratgies."""
+ """Base class for built-in strategies."""
def create(self, name_or_url, **kwargs):
# create url.URL object
@@ -180,7 +180,7 @@ PlainEngineStrategy()
class ThreadLocalEngineStrategy(DefaultEngineStrategy):
- """Strategy for configuring an Engine with thredlocal behavior."""
+ """Strategy for configuring an Engine with threadlocal behavior."""
name = 'threadlocal'
engine_cls = threadlocal.TLEngine