From: Mike Bayer Date: Fri, 5 Jul 2019 14:06:16 +0000 (-0400) Subject: Squashed commit of the following: X-Git-Tag: rel_1_4_0b1~812 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28daa34cb887e0f07e9f53e4b9e7596e6df12cd9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Squashed commit of the following: commit d4f3bedc74568b7ec543988ee2d43e64c5ace28f Author: Carson Ip Date: Fri Jul 5 11:20:12 2019 +0800 Fix typo in docstring commit a3e4b05744f51ec5d12a2fee1ad6093de904273e Author: Carson Ip Date: Fri Jul 5 11:14:57 2019 +0800 Fix typo in docstring Change-Id: Ifa2ebff5629bf970e5fac28bba64d501376cfae9 --- diff --git a/lib/sqlalchemy/ext/baked.py b/lib/sqlalchemy/ext/baked.py index 4bb55ca493..44e28d0454 100644 --- a/lib/sqlalchemy/ext/baked.py +++ b/lib/sqlalchemy/ext/baked.py @@ -629,7 +629,7 @@ def bake_lazy_loaders(): def unbake_lazy_loaders(): """Disable the use of baked queries for all lazyloaders systemwide. - This method now raises NotImplmentedError() as the "baked" implementation + This method now raises NotImplementedError() as the "baked" implementation is the only lazy load implementation. The :paramref:`.relationship.bake_queries` flag may be used to disable the caching of queries on a per-relationship basis. diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py index d3ecb2b5bb..5ae60e8549 100644 --- a/lib/sqlalchemy/orm/strategy_options.py +++ b/lib/sqlalchemy/orm/strategy_options.py @@ -506,7 +506,7 @@ class _UnboundLoad(Load): """Represent a loader option that isn't tied to a root entity. The loader option will produce an entity-linked :class:`.Load` - object when it is passed :metfh:`.Query.options`. + object when it is passed :meth:`.Query.options`. This provides compatibility with the traditional system of freestanding options, e.g. ``joinedload('x.y.z')``.