From e13f371ad1af5da98041021bca880741f853cc33 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Aug 29 2022 13:55:53 +0000
Subject: Update to 18.8.0


Resolves: rhbz#1978987

---

diff --git a/8245a74aa4.patch b/8245a74aa4.patch
deleted file mode 100644
index 496f0c0..0000000
--- a/8245a74aa4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8245a74aa4e090c40445535a9ce3997ed9904798 Mon Sep 17 00:00:00 2001
-From: Dominic Davis-Foster <dominic@davis-foster.co.uk>
-Date: Fri, 28 Jan 2022 23:11:52 +0000
-Subject: [PATCH] Switch from inspect.getargspec to inspect.getfullargspec
-
-inspect.getargspec has been deprecated since 3.0
----
- cherrypy/_cpdispatch.py | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/cherrypy/_cpdispatch.py b/cherrypy/_cpdispatch.py
-index 83eb79cbe..5c506e997 100644
---- a/cherrypy/_cpdispatch.py
-+++ b/cherrypy/_cpdispatch.py
-@@ -206,12 +206,8 @@ def test_callable_spec(callable, callable_args, callable_kwargs):
-     def test_callable_spec(callable, args, kwargs):  # noqa: F811
-         return None
- else:
--    getargspec = inspect.getargspec
--    # Python 3 requires using getfullargspec if
--    # keyword-only arguments are present
--    if hasattr(inspect, 'getfullargspec'):
--        def getargspec(callable):
--            return inspect.getfullargspec(callable)[:4]
-+    def getargspec(callable):
-+        return inspect.getfullargspec(callable)[:4]
- 
- 
- class LateParamPageHandler(PageHandler):
diff --git a/pytest-ignore-cgi-DeprecationWarnings.patch b/pytest-ignore-cgi-DeprecationWarnings.patch
index a8f9a9b..e5dd020 100644
--- a/pytest-ignore-cgi-DeprecationWarnings.patch
+++ b/pytest-ignore-cgi-DeprecationWarnings.patch
@@ -1,12 +1,12 @@
 diff --git a/pytest.ini b/pytest.ini
-index 771e0ae..928065a 100644
+index aef459eb..75faeb5b 100644
 --- a/pytest.ini
 +++ b/pytest.ini
-@@ -40,6 +40,7 @@ filterwarnings =
-     ignore:Exception ignored in. <socket.socket fd=-1, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=6>:pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception
-     ignore:Exception ignored in. <_io.FileIO .closed.>:pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception
+@@ -51,6 +51,7 @@ filterwarnings =
+   ignore:Exception ignored in. <socket.socket fd=-1, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=6>:pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception
+   ignore:Exception ignored in. <_io.FileIO .closed.>:pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception
  
-+    ignore:'cgi' is deprecated:DeprecationWarning
-     ignore:[gs]etName|currentThread:DeprecationWarning
-     ignore:Use cheroot.test.webtest:DeprecationWarning
-     ignore:This method will be removed in future versions.*:DeprecationWarning
++  ignore:'cgi' is deprecated:DeprecationWarning
+   ignore:Use cheroot.test.webtest:DeprecationWarning
+   ignore:This method will be removed in future versions.*:DeprecationWarning
+   ignore:Unable to verify that the server is bound on:UserWarning
diff --git a/pytest-ignore-thread-DeprecationWarnings.patch b/pytest-ignore-thread-DeprecationWarnings.patch
deleted file mode 100644
index 9e8da91..0000000
--- a/pytest-ignore-thread-DeprecationWarnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pytest.ini b/pytest.ini
-index 8919709..771e0ae 100644
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -40,6 +40,7 @@ filterwarnings =
-     ignore:Exception ignored in. <socket.socket fd=-1, family=AddressFamily.AF_INET, type=SocketKind.SOCK_STREAM, proto=6>:pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception
-     ignore:Exception ignored in. <_io.FileIO .closed.>:pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception
- 
-+    ignore:[gs]etName|currentThread:DeprecationWarning
-     ignore:Use cheroot.test.webtest:DeprecationWarning
-     ignore:This method will be removed in future versions.*:DeprecationWarning
-     ignore:Unable to verify that the server is bound on:UserWarning
diff --git a/python-cherrypy.spec b/python-cherrypy.spec
index 50485af..8822b22 100644
--- a/python-cherrypy.spec
+++ b/python-cherrypy.spec
@@ -9,22 +9,15 @@
 
 Name:           python-cherrypy
 %global         camelname CherryPy
-Version:        18.6.1
-Release:        7%{?dist}
+Version:        18.8.0
+Release:        1%{?dist}
 Summary:        Pythonic, object-oriented web development framework
 License:        BSD
 URL:            https://cherrypy.dev/
 Source0:        https://files.pythonhosted.org/packages/source/C/%{camelname}/%{camelname}-%{version}.tar.gz
 
-# Ignore thread-related DeprecationWarnings new in Python 3.10
-# Temporary workaround for https://github.com/cherrypy/cherrypy/issues/1914
-Patch1:         pytest-ignore-thread-DeprecationWarnings.patch
-
 # Ignore cgi-related DeprecationWarnings new in Python 3.11
-Patch2:         pytest-ignore-cgi-DeprecationWarnings.patch
-
-# Switch from inspect.getargspec to inspect.getfullargspec, merged upstream
-Patch3:         https://github.com/cherrypy/cherrypy/commit/8245a74aa4.patch
+Patch1:         pytest-ignore-cgi-DeprecationWarnings.patch
 
 BuildArch:      noarch
 
@@ -102,6 +95,9 @@ export WEBTEST_INTERACTIVE=false
 %exclude %{python3_sitelib}/cherrypy/tutorial
 
 %changelog
+* Mon Aug 29 2022 Dan Radez <dradez@redhat.com> - 18.8.0-1
+- updating to 18.8.0 (rhbz#2105856)
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 18.6.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 0c7707a..c8fdb31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (CherryPy-18.6.1.tar.gz) = 186a0992a443e1ffc1a2924b3351dcb0e6cc6c88b39ac32330d6365fe1b0a35c2008a3a18e1a57f61ffd1901ea6134333bb6288024d8ffbb1fd8e8dcd3145007
+SHA512 (CherryPy-18.8.0.tar.gz) = abacc995c1757b8d0171d57eb59b6e5931c46019d8f0f43479e334bb4f58b61a27541d9d0997d665f81905bc3c89e42d40d8e5a6e3a5f9bf251bc9089ceb5249