From: Priit Laes Date: Fri, 19 Dec 2014 16:46:16 +0000 (+0200) Subject: Maul the evaulate & friends typo X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e83d2f6fa66d5b2ed5de7e2a9cee7c71003c4d1a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Maul the evaulate & friends typo this is only a small part of the cherry-pick as the docs have been reorganized since 0.8 (cherry picked from commit 8ae47dc6e0a98b359247040236be0810b9086f40) Conflicts: doc/build/changelog/changelog_10.rst doc/build/changelog/migration_10.rst lib/sqlalchemy/ext/declarative/base.py (cherry picked from commit 6e7701d534141ed8c4cba668792f2bb528a5af61) Conflicts: doc/build/changelog/changelog_09.rst lib/sqlalchemy/dialects/postgresql/json.py lib/sqlalchemy/orm/query.py lib/sqlalchemy/sql/dml.py lib/sqlalchemy/sql/elements.py lib/sqlalchemy/sql/operators.py --- diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst index 5504a0ad67..e782ba9386 100644 --- a/doc/build/changelog/changelog_07.rst +++ b/doc/build/changelog/changelog_07.rst @@ -3517,7 +3517,7 @@ :tags: orm :tickets: 2122 - Some fixes to "evaulate" and "fetch" evaluation + Some fixes to "evaluate" and "fetch" evaluation when query.update(), query.delete() are called. The retrieval of records is done after autoflush in all cases, and before update/delete is diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst index 6515f731d3..baaa7b15b2 100644 --- a/doc/build/changelog/changelog_08.rst +++ b/doc/build/changelog/changelog_08.rst @@ -2214,7 +2214,7 @@ expr1 = mycolumn > 2 bool(expr1 == expr1) - Would evaulate as ``False``, even though this is an identity + Would evaluate as ``False``, even though this is an identity comparison, because ``mycolumn > 2`` would be "grouped" before being placed into the :class:`.BinaryExpression`, thus changing its identity. :class:`.BinaryExpression` now keeps track diff --git a/examples/sharding/attribute_shard.py b/examples/sharding/attribute_shard.py index 34b1be5b21..4ce8c247f4 100644 --- a/examples/sharding/attribute_shard.py +++ b/examples/sharding/attribute_shard.py @@ -168,7 +168,7 @@ def _get_query_comparisons(query): elif bind.callable: # some ORM functions (lazy loading) # place the bind's value as a - # callable for deferred evaulation. + # callable for deferred evaluation. value = bind.callable() else: # just use .value diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py index a8c59868ed..ba42e9c296 100644 --- a/lib/sqlalchemy/util/langhelpers.py +++ b/lib/sqlalchemy/util/langhelpers.py @@ -763,7 +763,7 @@ def asbool(obj): def bool_or_str(*text): - """Return a callable that will evaulate a string as + """Return a callable that will evaluate a string as boolean, or one of a set of "alternate" string values. """