From: Ville Skyttä Date: Fri, 7 Oct 2016 10:06:09 +0000 (+0300) Subject: Spelling fixes X-Git-Tag: rel_1_1_2~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e47063bfe0de1318c12a4f9ef67b9538cad34489;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Spelling fixes --- diff --git a/doc/build/changelog/changelog_03.rst b/doc/build/changelog/changelog_03.rst index 7c0a1af26b..3648e2756b 100644 --- a/doc/build/changelog/changelog_03.rst +++ b/doc/build/changelog/changelog_03.rst @@ -2753,7 +2753,7 @@ :tickets: a wide refactoring to "attribute loader" and "options" architectures. - ColumnProperty and PropertyLoader define their loading behaivor via switchable + ColumnProperty and PropertyLoader define their loading behavior via switchable "strategies", and MapperOptions no longer use mapper/property copying in order to function; they are instead propagated via QueryContext and SelectionContext objects at query/instances time. diff --git a/doc/build/changelog/changelog_05.rst b/doc/build/changelog/changelog_05.rst index f612ceed9a..5bcfd5fdfc 100644 --- a/doc/build/changelog/changelog_05.rst +++ b/doc/build/changelog/changelog_05.rst @@ -783,7 +783,7 @@ itself differently to some MapperExtensions. The change also affects the internal attribute API, but not - the AttributeExtension interface nor any of the publically + the AttributeExtension interface nor any of the publicly documented attribute functions. - The unit of work no longer genererates a graph of "dependency" @@ -1461,7 +1461,7 @@ Query.from_self() as well as query.subquery() both disable the rendering of eager joins inside the subquery produced. - The "disable all eager joins" feature is available publically + The "disable all eager joins" feature is available publicly via a new query.enable_eagerloads() generative. .. change:: diff --git a/doc/build/changelog/changelog_06.rst b/doc/build/changelog/changelog_06.rst index 168dac93c4..4a00201e75 100644 --- a/doc/build/changelog/changelog_06.rst +++ b/doc/build/changelog/changelog_06.rst @@ -5227,7 +5227,7 @@ :tickets: The construction of types within dialects has been totally - overhauled. Dialects now define publically available types + overhauled. Dialects now define publicly available types as UPPERCASE names exclusively, and internal implementation types using underscore identifiers (i.e. are private). The system by which types are expressed in SQL and DDL @@ -5332,7 +5332,7 @@ PickleType now uses == for comparison of values when mutable=True, unless the "comparator" argument with a - comparsion function is specified to the type. Objects + comparison function is specified to the type. Objects being pickled will be compared based on identity (which defeats the purpose of mutable=True) if __eq__() is not overridden or a comparison function is not provided. diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst index 008427584a..acb8362740 100644 --- a/doc/build/changelog/changelog_09.rst +++ b/doc/build/changelog/changelog_09.rst @@ -1048,7 +1048,7 @@ Fixed bug when the declarative ``__abstract__`` flag was not being distinguished for when it was actually the value ``False``. - The ``__abstract__`` flag needs to acutally evaluate to a True + The ``__abstract__`` flag needs to actually evaluate to a True value at the level being tested. .. changelog:: @@ -1852,7 +1852,7 @@ fully usable within declarative relationship configuration, as its string classname would not be available in the registry of classnames at mapper configuration time. The class now explicitly adds itself - to the class regsitry, and additionally both :class:`.AbstractConcreteBase` + to the class registry, and additionally both :class:`.AbstractConcreteBase` as well as :class:`.ConcreteBase` set themselves up *before* mappers are configured within the :func:`.configure_mappers` setup, using the new :meth:`.MapperEvents.before_configured` event. diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst index 8fd6b1dca2..887c5c61d6 100644 --- a/doc/build/changelog/changelog_10.rst +++ b/doc/build/changelog/changelog_10.rst @@ -436,7 +436,7 @@ provided by :class:`.Session` and :class:`.Connection`, and taking place for operations such as a failure on "RELEASE SAVEPOINT". Previously, the fix was only in place for a specific path within - the ORM flush/commit process; it now takes place for all transational + the ORM flush/commit process; it now takes place for all transactional context managers as well. .. change:: diff --git a/doc/build/changelog/migration_06.rst b/doc/build/changelog/migration_06.rst index 1eead6d3cc..e41446de5a 100644 --- a/doc/build/changelog/migration_06.rst +++ b/doc/build/changelog/migration_06.rst @@ -659,7 +659,7 @@ scenes to provide two goals: Highlights of these changes include: * The construction of types within dialects has been totally - overhauled. Dialects now define publically available types + overhauled. Dialects now define publicly available types as UPPERCASE names exclusively, and internal implementation types using underscore identifiers (i.e. are private). The system by which types are expressed in diff --git a/doc/build/changelog/migration_09.rst b/doc/build/changelog/migration_09.rst index 7d673c537c..0c0281a835 100644 --- a/doc/build/changelog/migration_09.rst +++ b/doc/build/changelog/migration_09.rst @@ -391,7 +391,7 @@ This is a small change demonstrated as follows:: # in 0.8, this would fail to load the unloaded state. assert attributes.get_history(a1, 'data') == ((), ['a1',], ()) - # load_history() is now equiavlent to get_history() with + # load_history() is now equivalent to get_history() with # passive=PASSIVE_OFF ^ INIT_OK assert inspect(a1).attrs.data.load_history() == ((), ['a1',], ()) @@ -1502,7 +1502,7 @@ insensitive names). The :class:`.quoted_name` object is used internally as needed; however if other keywords require fixed quoting preferences, the class is available -publically. +publicly. :ticket:`2812` diff --git a/doc/build/core/custom_types.rst b/doc/build/core/custom_types.rst index 2c3784b97c..dd93b5bb35 100644 --- a/doc/build/core/custom_types.rst +++ b/doc/build/core/custom_types.rst @@ -401,7 +401,7 @@ Output:: For an example of subclassing a built in type directly, we subclass :class:`.postgresql.BYTEA` to provide a ``PGPString``, which will make use of the -Postgresql ``pgcrypto`` extension to encrpyt/decrypt values +Postgresql ``pgcrypto`` extension to encrypt/decrypt values transparently:: from sqlalchemy import create_engine, String, select, func, \ diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 83facbf1f0..f107578b22 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 082661216d..2560937ab9 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 8e5d799687..4b2c047553 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 `, - 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 d0495fe5f4..52a502ae4b 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 cb712c94b3..e6416d173b 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 09ffaca2af..79feff7d9a 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 48f27b8b81..a48dec46f5 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 31e4d3d9c8..480b5ba7f5 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) diff --git a/test/engine/test_pool.py b/test/engine/test_pool.py index 5b87c90b89..1fbaf59654 100644 --- a/test/engine/test_pool.py +++ b/test/engine/test_pool.py @@ -262,7 +262,7 @@ class PoolTest(PoolTestBase): def test_rec_unconnected(self): # test production of a _ConnectionRecord with an - # initally unconnected state. + # initially unconnected state. dbapi = MockDBAPI() p1 = pool.Pool( diff --git a/test/orm/test_eager_relations.py b/test/orm/test_eager_relations.py index 962cb338b5..759d4c5ba2 100644 --- a/test/orm/test_eager_relations.py +++ b/test/orm/test_eager_relations.py @@ -578,7 +578,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL): self.assert_sql_count(testing.db, go, 1) def test_double_same_mappers(self): - """Eager loading with two relationships simulatneously, + """Eager loading with two relationships simultaneously, from the same table, using aliases.""" addresses, items, order_items, orders, \ diff --git a/test/orm/test_lazy_relations.py b/test/orm/test_lazy_relations.py index 6ae7d9a557..36ab5e765f 100644 --- a/test/orm/test_lazy_relations.py +++ b/test/orm/test_lazy_relations.py @@ -332,7 +332,7 @@ class LazyTest(_fixtures.FixtureTest): ) def test_double(self): - """tests lazy loading with two relationships simulatneously, + """tests lazy loading with two relationships simultaneously, from the same table, using aliases. """ users, orders, User, Address, Order, addresses = ( diff --git a/test/orm/test_subquery_relations.py b/test/orm/test_subquery_relations.py index 032f24a5e5..c8e8636fe5 100644 --- a/test/orm/test_subquery_relations.py +++ b/test/orm/test_subquery_relations.py @@ -559,7 +559,7 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL): self.assert_sql_count(testing.db, go, 4) def test_double_same_mappers(self): - """Eager loading with two relationships simulatneously, + """Eager loading with two relationships simultaneously, from the same table, using aliases.""" addresses, items, order_items, orders, Item, User, Address, Order, users = (self.tables.addresses, diff --git a/test/sql/test_generative.py b/test/sql/test_generative.py index 81c589d11e..6335a3cf1d 100644 --- a/test/sql/test_generative.py +++ b/test/sql/test_generative.py @@ -1814,7 +1814,7 @@ class ValuesBaseTest(fixtures.TestBase, AssertsCompiledSQL): i = i.values((5, 6, 7)) eq_(i.parameters, {"col1": 5, "col2": 6, "col3": 7}) - def test_kw_and_dict_simulatenously_single(self): + def test_kw_and_dict_simultaneously_single(self): i = t1.insert() i = i.values({"col1": 5}, col2=7) eq_(i.parameters, {"col1": 5, "col2": 7}) @@ -1904,7 +1904,7 @@ class ValuesBaseTest(fixtures.TestBase, AssertsCompiledSQL): i = t1.insert() assert_raises_message( exc.ArgumentError, - "Can't pass kwargs and multiple parameter sets simultaenously", + "Can't pass kwargs and multiple parameter sets simultaneously", i.values, [{"col1": 5}], col2=7 ) diff --git a/test/sql/test_inspect.py b/test/sql/test_inspect.py index 12d377e518..60267542a7 100644 --- a/test/sql/test_inspect.py +++ b/test/sql/test_inspect.py @@ -36,7 +36,7 @@ class TestCoreInspection(fixtures.TestBase): def test_no_clause_element_on_clauseelement(self): # re [ticket:3802], there are in the wild examples # of looping over __clause_element__, therefore the - # absense of __clause_element__ as a test for "this is the clause + # absence of __clause_element__ as a test for "this is the clause # element" must be maintained x = Column('foo', Integer) diff --git a/test/sql/test_resultset.py b/test/sql/test_resultset.py index f52412b683..64d496a8f1 100644 --- a/test/sql/test_resultset.py +++ b/test/sql/test_resultset.py @@ -424,7 +424,7 @@ class ResultProxyTest(fixtures.TablesTest): dict(user_id=1, user_name='john'), ) - # unary experssions + # unary expressions r = select([users.c.user_name.distinct()]).order_by( users.c.user_name).execute().first() eq_(r[users.c.user_name], 'john')