From: mike bayer <mike_mp@zzzcomputing.com>
Date: Fri, 7 Jan 2022 16:42:18 +0000 (+0000)
Subject: Merge "Fix various source comment/doc typos" into main
X-Git-Tag: rel_2_0_0b1~551
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5681d4e4da8ee69d83e9c0103c171d413d4c183e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge "Fix various source comment/doc typos" into main
---

5681d4e4da8ee69d83e9c0103c171d413d4c183e
diff --cc lib/sqlalchemy/orm/query.py
index 6c79055591,018fb703df..ad31c24329
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@@ -376,9 -378,12 +376,9 @@@ class Query
          # it to provide a real expression object.
          #
          # from there, it starts to look much like Query itself won't be
-         # passed into the execute process and wont generate its own cache
+         # passed into the execute process and won't generate its own cache
          # key; this will all occur in terms of the ORM-enabled Select.
 -        if (
 -            not self._compile_options._set_base_alias
 -            and not self._compile_options._with_polymorphic_adapt_map
 -        ):
 +        if not self._compile_options._set_base_alias:
              # if we don't have legacy top level aliasing features in use
              # then convert to a future select() directly
              stmt = self._statement_20(for_statement=True)