rpms/python-cherrypy2/devel python-cherrypy-2.3.0-py26-test.patch, NONE, 1.1 python-cherrypy2.spec, 1.4, 1.5

Toshio くらとみ toshio at fedoraproject.org
Mon Dec 1 19:42:47 UTC 2008


Author: toshio

Update of /cvs/pkgs/rpms/python-cherrypy2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16092

Modified Files:
	python-cherrypy2.spec 
Added Files:
	python-cherrypy-2.3.0-py26-test.patch 
Log Message:
- Patch to fix test errors with Python-2.6


python-cherrypy-2.3.0-py26-test.patch:

--- NEW FILE python-cherrypy-2.3.0-py26-test.patch ---
diff -up CherryPy-2.3.0/cherrypy/test/test_core.py.py26 CherryPy-2.3.0/cherrypy/test/test_core.py
--- CherryPy-2.3.0/cherrypy/test/test_core.py.py26	2008-12-01 11:28:19.000000000 -0800
+++ CherryPy-2.3.0/cherrypy/test/test_core.py	2008-12-01 11:28:36.000000000 -0800
@@ -52,7 +52,7 @@ def setup_server():
         and adds an instance of the subclass as an attribute of cherrypy.root.
         """
         def __init__(cls, name, bases, dct):
-            type.__init__(name, bases, dct)
+            type.__init__(cls, name, bases, dct)
             for value in dct.itervalues():
                 if isinstance(value, types.FunctionType):
                     value.exposed = True
diff -up CherryPy-2.3.0/cherrypy/test/test_custom_filters.py.py26 CherryPy-2.3.0/cherrypy/test/test_custom_filters.py
--- CherryPy-2.3.0/cherrypy/test/test_custom_filters.py.py26	2008-12-01 11:28:29.000000000 -0800
+++ CherryPy-2.3.0/cherrypy/test/test_custom_filters.py	2008-12-01 11:28:49.000000000 -0800
@@ -79,7 +79,7 @@ def setup_server():
         and adds an instance of the subclass as an attribute of cherrypy.root.
         """
         def __init__(cls, name, bases, dct):
-            type.__init__(name, bases, dct)
+            type.__init__(cls, name, bases, dct)
             for value in dct.itervalues():
                 if isinstance(value, types.FunctionType):
                     value.exposed = True


Index: python-cherrypy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy2/devel/python-cherrypy2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-cherrypy2.spec	1 Dec 2008 18:22:44 -0000	1.4
+++ python-cherrypy2.spec	1 Dec 2008 19:42:17 -0000	1.5
@@ -12,6 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         python-cherrypy-tutorial-doc.patch
 Patch1:         python-cherrypy-2.3.0-EINTR.patch
+Patch2:         python-cherrypy-2.3.0-py26-test.patch
 
 BuildArch:      noarch
 
@@ -36,6 +37,7 @@
 %setup -q -n CherryPy-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i 's/\r//' CHANGELOG.txt README.txt CHERRYPYTEAM.txt cherrypy/tutorial/README.txt
 cp -p %{SOURCE1} .
@@ -66,7 +68,7 @@
 %changelog
 * Mon Dec 1 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-6
 - Set tests to be non-interactive via the commandline instead of a patch.
-  Should fix build errors with Python-2.6
+- Patch to fix test errors with Python-2.6
 
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.3.0-5
 - Rebuild for Python 2.6




More information about the fedora-extras-commits mailing list