diff --git a/CherryPy-18.8.0.tar.gz b/CherryPy-18.8.0.tar.gz deleted file mode 100644 index c7ca728..0000000 --- a/CherryPy-18.8.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b48cfba8a2f16d5b6419cc657e6d51db005ba35c5e3824e4728bb03bbc7ef9b -size 622679 diff --git a/CherryPy-18.9.0.tar.gz b/CherryPy-18.9.0.tar.gz new file mode 100644 index 0000000..7015054 --- /dev/null +++ b/CherryPy-18.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b06c191ce71a86461f30572a1ab57ffc09f43143ba8e42c103c7b3347220eb1 +size 631900 diff --git a/python-CherryPy.changes b/python-CherryPy.changes index 31176b6..2280a25 100644 --- a/python-CherryPy.changes +++ b/python-CherryPy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jan 14 17:18:14 UTC 2024 - Dirk Müller + +- update to 18.9.0: + * Various changes. +- drop use-read_file-not-readfp.patch (upstream) + ------------------------------------------------------------------- Wed Nov 22 03:23:15 UTC 2023 - Steve Kowalik @@ -27,7 +34,7 @@ Tue Aug 2 11:32:54 UTC 2022 - Otto Hollmann - Changes from v18.7.0 * Drop support for Python 3.5. * Fixed compatibility on Python 3.11. -- Fix URL in spec file: cherrypy.org -> cherrypy.dev +- Fix URL in spec file: cherrypy.org -> cherrypy.dev ------------------------------------------------------------------- Tue Oct 5 14:01:39 UTC 2021 - Stefan Schubert @@ -84,7 +91,7 @@ Mon Jan 13 15:00:55 UTC 2020 - Marketa Calabkova * Fixed issue where bytes values in a HeaderMap would be converted to strings. * Rely on jaraco.collections for its case-insensitive dictionary support. * Fixed issue in cpstats where the data/ endpoint would fail with encoding errors on Python 3. - * Simplify the passthrough of parameters to CPWebCase.getPage to cheroot. + * Simplify the passthrough of parameters to CPWebCase.getPage to cheroot. CherryPy now requires cheroot 8.2.1 or later. ------------------------------------------------------------------- @@ -143,7 +150,7 @@ Fri May 31 15:32:40 CEST 2019 - Matej Cepl Thu May 16 18:12:19 UTC 2019 - Guang Yee - Disable test_wait_publishes_periodically test as it is unstable and - highly time sensitive. + highly time sensitive. ------------------------------------------------------------------- Thu Mar 28 14:03:13 UTC 2019 - Tomáš Chvátal @@ -226,7 +233,7 @@ Wed May 23 04:54:27 UTC 2012 - highwaystar.ru@gmail.com - update to 3.2.2 - python3 package added -- minor spec improvement +- minor spec improvement ------------------------------------------------------------------- Tue May 31 07:21:03 UTC 2011 - saschpe@suse.de diff --git a/python-CherryPy.spec b/python-CherryPy.spec index 3018abf..9371237 100644 --- a/python-CherryPy.spec +++ b/python-CherryPy.spec @@ -1,7 +1,7 @@ # # spec file for package python-CherryPy # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,14 +24,12 @@ %{?sle15_python_module_pythons} Name: python-CherryPy -Version: 18.8.0 +Version: 18.9.0 Release: 0 Summary: Object-Oriented HTTP framework License: BSD-3-Clause URL: https://www.cherrypy.dev Source: https://files.pythonhosted.org/packages/source/C/CherryPy/CherryPy-%{version}.tar.gz -# PATCH-FIX-UPSTREAM https://github.com/cherrypy/cherrypy/pull/1959 -Patch0: use-read_file-not-readfp.patch BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools_scm} BuildRequires: %{python_module wheel} diff --git a/use-read_file-not-readfp.patch b/use-read_file-not-readfp.patch deleted file mode 100644 index 859e873..0000000 --- a/use-read_file-not-readfp.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d2bc527c12a74675d67ba5fbf9de0d014af929cb Mon Sep 17 00:00:00 2001 -From: Dan Radez -Date: Tue, 12 Apr 2022 09:40:46 -0400 -Subject: [PATCH] Replace readfp with read_file - -Getting Deprecation Warning in python 3.11: -DeprecationWarning: This method will be removed in Python 3.12. -Use 'parser.read_file()' instead. - -https://github.com/python/cpython/commit/e8659b47dece5a272111c0af5e340c364a9f807b#diff-ca80d44aeeadd5e4966195b99aff106abb3e7b0b5356b7499125ee021bd84777R757 - -If I'm reading this correct read_file has been around since Python 2.7 -https://github.com/python/cpython/commit/a492362f9a2a44e411147fd7b2886466bb0bb17f ---- - cherrypy/lib/reprconf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cherrypy/lib/reprconf.py b/cherrypy/lib/reprconf.py -index 76381d7b7..536b94173 100644 ---- a/cherrypy/lib/reprconf.py -+++ b/cherrypy/lib/reprconf.py -@@ -188,7 +188,7 @@ def as_dict(self, raw=False, vars=None): - - def dict_from_file(self, file): - if hasattr(file, 'read'): -- self.readfp(file) -+ self.read_file(file) - else: - self.read(file) - return self.as_dict()