[TurboGears] Create patch for building under python-2.7.2
Toshio くらとみ
toshio at fedoraproject.org
Tue Jul 5 22:23:42 UTC 2011
commit 39d63da63a7df6dcf77ca522a76bc05592b4632a
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Tue Jul 5 15:22:58 2011 -0700
Create patch for building under python-2.7.2
TurboGears.spec | 5 ++++-
turbogears-py-2.7.2.patch | 18 ++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/TurboGears.spec b/TurboGears.spec
index 0f9c583..f3a27d8 100644
--- a/TurboGears.spec
+++ b/TurboGears.spec
@@ -19,6 +19,8 @@ Patch2: turbogears-feed.patch
# From upstream svn http://svn.code.sf.net/p/turbogears1/code/branches/1.1/
# r7315 and r7317
Patch3: turbogears-sa-0.7.1.patch
+# Reported upstream https://sourceforge.net/p/turbogears1/tickets/32/
+Patch4: turbogears-py-2.7.2.patch
# Patch to allow turbogears to work with old turbokid until/unless RHEL6
# updates
Patch100: TurboGears-old-turbokid.patch
@@ -115,6 +117,7 @@ TurboGears is easy to use for a wide range of web applications.
%patch1 -p1 -b .sqlcreate
%patch2 -p1 -b .feed
%patch3 -p0 -b .sa
+%patch4 -p1 -b py2.7
%if 0%{?rhel} && 0%{?rhel} >= 6
%patch100 -p1 -b .deps
%endif
@@ -153,7 +156,7 @@ rm -rf %{buildroot}
%changelog
* Tue Jul 5 2011 Toshio Kuratomi <toshio at feoraproject.org> - 1.1.2-5
-- Add patches from upstream for building with SQLalchemy-0.7.1
+- Add patches for building with SQLalchemy-0.7.1 and python-2.7.2
https://bugzilla.redhat.com/show_bug.cgi?id=715760
* Sat Jun 25 2011 Toshio Kuratomi <toshio at feoraproject.org> - 1.1.2-4
diff --git a/turbogears-py-2.7.2.patch b/turbogears-py-2.7.2.patch
new file mode 100644
index 0000000..41426ec
--- /dev/null
+++ b/turbogears-py-2.7.2.patch
@@ -0,0 +1,18 @@
+Index: TurboGears-1.1.2/turbogears/tests/test_util.py
+===================================================================
+--- TurboGears-1.1.2.orig/turbogears/tests/test_util.py
++++ TurboGears-1.1.2/turbogears/tests/test_util.py
+@@ -253,9 +253,10 @@ def test_quote_cookie():
+ quote = util.quote_cookie
+ assert quote('Hello!') == 'Hello!'
+ assert quote('K\xe4se') == '"K\\344se"'
+- assert quote('Hello, W\xf6rld!') == '"Hello, W\\366rld!"'
+- assert quote('$1;\tinsert coin!') == '"$1;\\011insert coin!"'
+- assert quote('Hello, "W\\orld"!') == r'"Hello, \"W\\orld\"!"'
++ # python-2.7.2 also encodes "," and ";"
++ assert quote('Hello, W\xf6rld!') in ('"Hello, W\\366rld!"', '"Hello\\054 W\\366rld!"')
++ assert quote('$1;\tinsert coin!') in ('"$1;\\011insert coin!"', '"$1\\073\\011insert coin!"')
++ assert quote('Hello, "W\\orld"!') in (r'"Hello, \"W\\orld\"!"', r'"Hello\054 \"W\\orld\"!"')
+
+
+ def test_unquote_cookie():
More information about the scm-commits
mailing list