From: Nils Philippsen Date: Mon, 9 Nov 2015 13:50:23 +0000 (+0100) Subject: py2k: accept unicode literals on :func:`backref`, too X-Git-Tag: rel_1_1_0b1~84^2~70^2~28 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef85a0d189880d0d6a0e55c104fb6d6dd4045abe;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git 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) --- diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst index b7b792d4d5..f5e550ed0d 100644 --- a/doc/build/changelog/changelog_10.rst +++ b/doc/build/changelog/changelog_10.rst @@ -18,6 +18,16 @@ .. changelog:: :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 diff --git a/doc/build/changelog/changelog_11.rst b/doc/build/changelog/changelog_11.rst index 2ba2046233..ea0b62a5e8 100644 --- a/doc/build/changelog/changelog_11.rst +++ b/doc/build/changelog/changelog_11.rst @@ -21,14 +21,6 @@ .. changelog:: :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