diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-08 16:21:20 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-08 16:21:20 -0400 |
| commit | 271a098b642041744dc904b9a6eddbf7f784a554 (patch) | |
| tree | 2290e49a01b1568140fb8f35f48c53d799a265d2 | |
| parent | 654514c5b225f9be80a95b365403ae9fb775804c (diff) | |
| parent | 6224df56a6fa28efda6e6e5007b015ad9d6d7d14 (diff) | |
| download | sqlalchemy-271a098b642041744dc904b9a6eddbf7f784a554.tar.gz | |
Merge branch 'patch-1' of https://github.com/UnquietCode/sqlalchemy
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 2d3cb1b08..0d2fe6a7f 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -1592,7 +1592,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) ) |