From a4b6d4168d9ce4bba503f49a9e54964fb234f12dfec0d364b6234ff96f5e65e0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 10 Feb 2025 13:48:19 +0000 Subject: [PATCH 1/3] Accepting request 1244707 from home:glaubitz:branches:devel:languages:python MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Update to 2.1.1 * Add support for 3.13 * Don’t require legacy-cgi to be installed on 3.13 and later (#176) * Don’t permit FieldStorageUploadConverter to be instantiated without having legacy-cgi installed since it does not make sense * Releases are now automated through GitHub Actions (#184) - Adjust upstream source name in spec file - Drop do-not-always-use-cgi-module.patch, merged upstream OBS-URL: https://build.opensuse.org/request/show/1244707 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-FormEncode?expand=0&rev=37 --- FormEncode-2.1.0.tar.gz | 3 -- do-not-always-use-cgi-module.patch | 56 ------------------------------ formencode-2.1.1.tar.gz | 3 ++ python-FormEncode.changes | 12 +++++++ python-FormEncode.spec | 10 +++--- 5 files changed, 19 insertions(+), 65 deletions(-) delete mode 100644 FormEncode-2.1.0.tar.gz delete mode 100644 do-not-always-use-cgi-module.patch create mode 100644 formencode-2.1.1.tar.gz diff --git a/FormEncode-2.1.0.tar.gz b/FormEncode-2.1.0.tar.gz deleted file mode 100644 index 407f2d4..0000000 --- a/FormEncode-2.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb74d223078a28cf015fa88966c6e34f2d18d75127318d65c144bed9afc4263f -size 277757 diff --git a/do-not-always-use-cgi-module.patch b/do-not-always-use-cgi-module.patch deleted file mode 100644 index 8da80e4..0000000 --- a/do-not-always-use-cgi-module.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 77053ce944c11b1bae67cee387275e9f36d8d049 Mon Sep 17 00:00:00 2001 -From: Oleg Broytman -Date: Fri, 10 Nov 2023 18:17:15 +0300 -Subject: [PATCH] Protect `import cgi` - -Module `cgi` was declared obsolete in Python 3.11 -and will be removed in 3.13. - -Fixes: #175. ---- - src/formencode/validators.py | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/formencode/validators.py b/src/formencode/validators.py -index f2011b4..6f272b7 100644 ---- a/src/formencode/validators.py -+++ b/src/formencode/validators.py -@@ -5,7 +5,10 @@ - Validator/Converters for use with FormEncode. - """ - --import cgi -+try: -+ import cgi -+except ImportError: # Python >= 3.13 -+ cgi = None - import re - import warnings - from encodings import idna -@@ -1772,7 +1775,7 @@ class FieldStorageUploadConverter(FancyValidator): - no upload was given). - """ - def _convert_to_python(self, value, state=None): -- if isinstance(value, cgi.FieldStorage): -+ if cgi and isinstance(value, cgi.FieldStorage): - if getattr(value, 'filename', None): - return value - raise Invalid('invalid', value, state) -@@ -1780,7 +1783,7 @@ def _convert_to_python(self, value, state=None): - return value - - def is_empty(self, value): -- if isinstance(value, cgi.FieldStorage): -+ if cgi and isinstance(value, cgi.FieldStorage): - return not bool(getattr(value, 'filename', None)) - return FancyValidator.is_empty(self, value) - -@@ -1825,7 +1828,7 @@ def _convert_to_python(self, value, state): - upload = value.get(self.upload_key) - static = value.get(self.static_key, '').strip() - filename = content = None -- if isinstance(upload, cgi.FieldStorage): -+ if cgi and isinstance(upload, cgi.FieldStorage): - filename = upload.filename - content = upload.value - elif isinstance(upload, str) and upload: diff --git a/formencode-2.1.1.tar.gz b/formencode-2.1.1.tar.gz new file mode 100644 index 0000000..f342fac --- /dev/null +++ b/formencode-2.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e17f16199d232e54f67912004f3ad333cdbbb81a1a1a10238acf09bab99f9199 +size 277607 diff --git a/python-FormEncode.changes b/python-FormEncode.changes index 00c0006..152bf66 100644 --- a/python-FormEncode.changes +++ b/python-FormEncode.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Feb 10 10:10:13 UTC 2025 - John Paul Adrian Glaubitz + +- Update to 2.1.1 + * Add support for 3.13 + * Don’t require legacy-cgi to be installed on 3.13 and later (#176) + * Don’t permit FieldStorageUploadConverter to be instantiated without + having legacy-cgi installed since it does not make sense + * Releases are now automated through GitHub Actions (#184) +- Adjust upstream source name in spec file +- Drop do-not-always-use-cgi-module.patch, merged upstream + ------------------------------------------------------------------- Tue Sep 10 04:11:22 UTC 2024 - Steve Kowalik diff --git a/python-FormEncode.spec b/python-FormEncode.spec index a533d42..21f1a3b 100644 --- a/python-FormEncode.spec +++ b/python-FormEncode.spec @@ -1,7 +1,7 @@ # # spec file for package python-FormEncode # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,12 @@ %{?sle15_python_module_pythons} Name: python-FormEncode -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: HTML form validation, generation, and conversion package License: Python-2.0 URL: https://formencode.org -Source: https://files.pythonhosted.org/packages/source/F/FormEncode/FormEncode-%{version}.tar.gz -# PATCH-FIX-UPSTREAM gh#formencode/formencode#176 -Patch0: do-not-always-use-cgi-module.patch +Source: https://files.pythonhosted.org/packages/source/f/formencode/formencode-%{version}.tar.gz BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module dnspython} BuildRequires: %{python_module pip} @@ -45,7 +43,7 @@ a declarative form of defining the validation, and decoupled processes for filling and generating forms. %prep -%autosetup -p1 -n FormEncode-%{version} +%autosetup -p1 -n formencode-%{version} %build %pyproject_wheel From f8a121450cb07e32055ee24a4c4a8777467e49d42e49529debb916859868bc98 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Wed, 26 Mar 2025 00:39:43 +0000 Subject: [PATCH 2/3] - Lowercase metadata directory name. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-FormEncode?expand=0&rev=38 --- python-FormEncode.changes | 5 +++++ python-FormEncode.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-FormEncode.changes b/python-FormEncode.changes index 152bf66..1c34443 100644 --- a/python-FormEncode.changes +++ b/python-FormEncode.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 26 00:39:25 UTC 2025 - Steve Kowalik + +- Lowercase metadata directory name. + ------------------------------------------------------------------- Mon Feb 10 10:10:13 UTC 2025 - John Paul Adrian Glaubitz diff --git a/python-FormEncode.spec b/python-FormEncode.spec index 21f1a3b..b94e315 100644 --- a/python-FormEncode.spec +++ b/python-FormEncode.spec @@ -71,6 +71,6 @@ python2_flags="--version" %license LICENSE.txt %doc README.rst %{python_sitelib}/formencode -%{python_sitelib}/FormEncode-%{version}.dist-info +%{python_sitelib}/formencode-%{version}.dist-info %changelog From be3afe0b3328a50572c1760acbba07ef844f373a8bef1e4d9ffa5d9738ef1ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Tue, 1 Apr 2025 12:22:41 +0000 Subject: [PATCH 3/3] Accepting request 1266112 from home:mcalabkova:branches:devel:languages:python - Make the dist-info name case-insensitive OBS-URL: https://build.opensuse.org/request/show/1266112 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-FormEncode?expand=0&rev=39 --- python-FormEncode.changes | 5 +++++ python-FormEncode.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-FormEncode.changes b/python-FormEncode.changes index 1c34443..7670836 100644 --- a/python-FormEncode.changes +++ b/python-FormEncode.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 1 11:56:57 UTC 2025 - Markéta Machová + +- Make the dist-info name case-insensitive + ------------------------------------------------------------------- Wed Mar 26 00:39:25 UTC 2025 - Steve Kowalik diff --git a/python-FormEncode.spec b/python-FormEncode.spec index b94e315..b45c1eb 100644 --- a/python-FormEncode.spec +++ b/python-FormEncode.spec @@ -71,6 +71,6 @@ python2_flags="--version" %license LICENSE.txt %doc README.rst %{python_sitelib}/formencode -%{python_sitelib}/formencode-%{version}.dist-info +%{python_sitelib}/[fF]orm[eE]ncode-%{version}.dist-info %changelog