[python-cherrypy2] Fixed failing test preventing build against python 2.7
Martin Bacovsky
mbacovsk at fedoraproject.org
Fri Jul 30 10:15:15 UTC 2010
commit 97c08d7c2311f538fef6cd84e679d7f3778c9fa3
Author: Martin Bačovský <mbacovsk at redhat.com>
Date: Fri Jul 30 12:14:22 2010 +0200
Fixed failing test preventing build against python 2.7
python-cherrypy-2.3.0-broken_tests.patch | 12 ++++++++++++
python-cherrypy2.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/python-cherrypy-2.3.0-broken_tests.patch b/python-cherrypy-2.3.0-broken_tests.patch
new file mode 100644
index 0000000..d95b776
--- /dev/null
+++ b/python-cherrypy-2.3.0-broken_tests.patch
@@ -0,0 +1,12 @@
+diff -up CherryPy-2.3.0/cherrypy/test/webtest.py.broken_tests CherryPy-2.3.0/cherrypy/test/webtest.py
+--- CherryPy-2.3.0/cherrypy/test/webtest.py.broken_tests 2010-07-28 18:31:14.000000000 +0200
++++ CherryPy-2.3.0/cherrypy/test/webtest.py 2010-07-28 18:31:53.000000000 +0200
+@@ -485,7 +485,7 @@ def openURL(url, headers=None, method="G
+ skip_accept_encoding=True)
+
+ for key, value in headers:
+- conn.putheader(key, value)
++ conn.putheader(key, str(value))
+ conn.endheaders()
+
+ if body is not None:
diff --git a/python-cherrypy2.spec b/python-cherrypy2.spec
index 4326d00..b9fdf6c 100644
--- a/python-cherrypy2.spec
+++ b/python-cherrypy2.spec
@@ -2,7 +2,7 @@
Name: python-cherrypy2
Version: 2.3.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: A pythonic, object-oriented web development framework
Group: Development/Libraries
License: BSD
@@ -14,6 +14,7 @@ Patch0: python-cherrypy-tutorial-doc.patch
Patch1: python-cherrypy-2.3.0-EINTR.patch
Patch2: python-cherrypy-2.3.0-py26-test.patch
Patch3: python-cherrypy-deprecation.patch
+Patch4: python-cherrypy-2.3.0-broken_tests.patch
BuildArch: noarch
@@ -40,6 +41,7 @@ CherryPy.
%patch1 -p1
%patch2 -p1
%patch3 -p1 -b .depr
+%patch4 -p1
%{__sed} -i 's/\r//' CHANGELOG.txt README.txt CHERRYPYTEAM.txt cherrypy/tutorial/README.txt
cp -p %{SOURCE1} .
@@ -67,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Fri Jul 30 2010 Martin Bacovsky <mbacovsk at redhat.com> - 2.3.0-13
+- fixed tests failing on python 2.7
+
* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.3.0-12
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
More information about the scm-commits
mailing list