rpms/python-cherrypy/devel python-cherrypy-changederrormessage.patch, NONE, 1.1 python-cherrypy.spec, 1.26, 1.27

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/python-cherrypy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28828

Modified Files:
	python-cherrypy.spec 
Added Files:
	python-cherrypy-changederrormessage.patch 
Log Message:

* Mon May 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-4
- Fix a failing unittest with newer python


python-cherrypy-changederrormessage.patch:
 test_session.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE python-cherrypy-changederrormessage.patch ---
Index: CherryPy-3.1.2/cherrypy/test/test_session.py
===================================================================
--- CherryPy-3.1.2.orig/cherrypy/test/test_session.py
+++ CherryPy-3.1.2/cherrypy/test/test_session.py
@@ -10,6 +10,7 @@ import time
 
 import cherrypy
 from cherrypy.lib import sessions
+from cherrypy.lib.http import response_codes
 
 def http_methods_allowed(methods=['GET', 'HEAD']):
     method = cherrypy.request.method.upper()
@@ -254,7 +255,7 @@ class SessionTest(helper.CPWebCase):
         # before_finalize (save) and on_end (close). So the session
         # code has to survive calling save/close without init.
         self.getPage('/restricted', self.cookies, method='POST')
-        self.assertErrorPage(405, "Specified method is invalid for this server.")
+        self.assertErrorPage(405, response_codes[405][1])
     
     def test_6_regenerate(self):
         self.getPage('/testStr')


Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy/devel/python-cherrypy.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- python-cherrypy.spec	24 Apr 2010 18:18:02 -0000	1.26
+++ python-cherrypy.spec	1 Jun 2010 01:53:07 -0000	1.27
@@ -4,13 +4,14 @@
 
 Name:           python-cherrypy
 Version:        3.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.cherrypy.org/
 Source0:        http://download.cherrypy.org/cherrypy/%{version}/CherryPy-%{version}.tar.gz
 Patch0:         python-cherrypy-tutorial-doc.patch
+Patch1: python-cherrypy-changederrormessage.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,6 +29,7 @@ results in smaller source code developed
 %prep
 %setup -q -n CherryPy-%{version}
 %patch0 -p1
+%patch1 -p1 -b .errmsg
 
 %{__sed} -i 's/\r//' README.txt cherrypy/tutorial/README.txt cherrypy/tutorial/tutorial.conf
 
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Mon May 31 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-4
+- Fix a failing unittest with newer python
+
 * Sat Apr 24 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 3.1.2-3
 - Revert a try at 3.2.x-rc1 as the tests won't pass without some work.