diff options
| author | Nils Philippsen <nils@redhat.com> | 2015-11-09 14:50:23 +0100 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-11-30 12:49:44 -0500 |
| commit | ef85a0d189880d0d6a0e55c104fb6d6dd4045abe (patch) | |
| tree | 5c6dd55da5b345e860036a0af0c2537931b1fd05 | |
| parent | d5fd26b836afb85ffbb2d4749660d4895090d620 (diff) | |
| download | sqlalchemy-ef85a0d189880d0d6a0e55c104fb6d6dd4045abe.tar.gz | |
py2k: accept unicode literals on :func:`backref`, too
Fixed bug where in Py2K a unicode literal would not be accepted as the
string name of a class or other argument within declarative using
:func:`.backref` on :func:`.relationship`.
amends commit e6f67f48054d906856f879bc1803ea639aa4b670
backport to rel_1_0
(cherry picked from commit 58f73d2278393d813c7f39736fc96c5086f18f6d)
(cherry picked from commit 33c3aded3a1944d93e9e6bca53e2f749980b8b09)
| -rw-r--r-- | doc/build/changelog/changelog_10.rst | 10 | ||||
| -rw-r--r-- | doc/build/changelog/changelog_11.rst | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst index b7b792d4d..f5e550ed0 100644 --- a/doc/build/changelog/changelog_10.rst +++ b/doc/build/changelog/changelog_10.rst @@ -19,6 +19,16 @@ :version: 1.0.10 .. change:: + :tags: bug, orm + :pullreq: github:212 + :versions: 1.1.0b1 + + Fixed bug where in Py2K a unicode literal would not be accepted as the + string name of a class or other argument within declarative using + :func:`.backref` on :func:`.relationship`. Pull request courtesy + Nils Philippsen. + + .. change:: :tags: bug, mssql :versions: 1.1.0b1 :pullreq: github:206 diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst index 2ba204623..ea0b62a5e 100644 --- a/doc/build/changelog/changelog_11.rst +++ b/doc/build/changelog/changelog_11.rst @@ -22,14 +22,6 @@ :version: 1.1.0b1 .. change:: - :tags: bug, orm, declarative - :pullreq: github:212 - - Fixed bug where in Py2K a unicode literal would not be accepted as the - string name of a class or other argument within declarative using - :func:`.backref` on :func:`.relationship`. - - .. change:: :tags: bug, postgresql :tickets: 3587 |