From: Ben Fagin <blouis@unquietcode.com>
Date: Mon, 1 May 2017 17:30:11 +0000 (-0700)
Subject: fixes a typo
X-Git-Tag: rel_1_0_18~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46c61b6c4116b59b8c50babf368cb9ce46ef4fe7;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fixes a typo
(cherry picked from commit 6224df56a6fa28efda6e6e5007b015ad9d6d7d14)
---

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index b9fd60e11e..9c6f1a86c7 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -1580,7 +1580,7 @@ class Session(_SessionClassMethods):
                         "that the mapped Column object is configured to "
                         "expect these generated values.  Ensure also that "
                         "this flush() is not occurring at an inappropriate "
-                        "time, such aswithin a load() event."
+                        "time, such as within a load() event."
                         % state_str(state)
                     )