From e70e8d06ca7772fdd7d8311765a54fdfa522c9b0 Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@redhat.com>
Date: Aug 27 2014 21:44:54 +0000
Subject: Remove the changederrormessage and unittest patches


---

diff --git a/cherrypy-unittest.patch b/cherrypy-unittest.patch
deleted file mode 100644
index 0cb9774..0000000
--- a/cherrypy-unittest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- CherryPy-3.2.2/cherrypy/test/helper.py.orig	2011-10-27 22:34:31.218368540 -0700
-+++ CherryPy-3.2.2/cherrypy/test/helper.py	2011-10-27 22:34:53.093040680 -0700
-@@ -299,7 +299,7 @@
-     def test_gc(self):
-         if self.do_gc_test:
-             self.getPage("/gc/stats")
--            self.assertBody("Statistics:")
-+            self.assertMatchesBody("^Statistics:")
-     # Tell nose to run this last in each class.
-     # Prefer sys.maxint for Python 2.3, which didn't have float('inf')
-     test_gc.compat_co_firstlineno = getattr(sys, 'maxint', None) or float('inf')
diff --git a/python-cherrypy-changederrormessage.patch b/python-cherrypy-changederrormessage.patch
deleted file mode 100644
index 0d4a5dd..0000000
--- a/python-cherrypy-changederrormessage.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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')