diff --git a/198.patch b/198.patch deleted file mode 100644 index 17783092aa21d9ac3390cfb7ef7cfd6744f2e0f1..0000000000000000000000000000000000000000 --- a/198.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fe769c72e4f9d613b2ce066325d2fb28317833d5 Mon Sep 17 00:00:00 2001 -From: Lumir Balhar -Date: Thu, 18 May 2023 14:09:34 +0200 -Subject: [PATCH] Check for cert_file attribute before accessing it - -In Python 3.12, HTTPSConnection no longer has cert_file attribute -so unless something adds it to the subclass, the attribute doesn't -exist by default. - -CPython change: https://github.com/python/cpython/commit/ef0e72b31d22f780d3a165d7d0471806061fe380#diff-3cf29d90eb758d0fe5ec013bbfda9b0bb60be4f7d899583bd5f490a7a5a5dc5f ---- - distlib/util.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/distlib/util.py b/distlib/util.py -index dd01849..ddfc992 100644 ---- a/distlib/util.py -+++ b/distlib/util.py -@@ -1435,7 +1435,7 @@ def connect(self): - context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) - if hasattr(ssl, 'OP_NO_SSLv2'): - context.options |= ssl.OP_NO_SSLv2 -- if self.cert_file: -+ if hasattr(self, "cert_file") and self.cert_file: - context.load_cert_chain(self.cert_file, self.key_file) - kwargs = {} - if self.ca_certs: diff --git a/python-distlib.spec b/python-distlib.spec index df971c45754947021724c0fca8367e6dba2b797a..72ce7b5ea726b221c91e23da0ef284652cb8e804 100644 --- a/python-distlib.spec +++ b/python-distlib.spec @@ -7,13 +7,12 @@ to reinvent wheels, and improved interoperability between tools.} Summary: Low-level components of distutils2/packaging, augmented with higher-level APIs Name: python-distlib -Version: 0.3.6 -Release: 2%{?dist} +Version: 0.3.7 +Release: 1%{?dist} License: Python URL: https://readthedocs.org/projects/distlib/ Source0: %pypi_source %{srcname} %{version} -Patch0001: https://github.com/pypa/distlib/pull/198.patch BuildRequires: python%{python3_pkgversion}-devel pyproject-rpm-macros BuildRequires: python%{python3_pkgversion}-pytest @@ -55,6 +54,9 @@ export SKIP_ONLINE=1 %doc README.rst %changelog +* Tue Sep 26 2023 Wang Guodong - 0.3.7-1 +- Upgrade to version 0.3.7 + * Tue Sep 19 2023 OpenCloudOS Release Engineering - 0.3.6-2 - Rebuilt for python 3.11 diff --git a/sources b/sources index ad1e13f0cc3b1b51c8d5d5d90c64d675602ddfc3..2f1a15d294d869d1e4ba04e28ac4349534b3b60f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (distlib-0.3.6.tar.gz) = 27f3a59f9175a92befb9a65a66cd0b8eb65185dab6fa13ef94e85ca69c2bc1b7281ce1522601034007cb98677ba9237a46224df4adc70ed966db7e131e073636 +SHA512 (distlib-0.3.7.tar.gz) = 3e321d2de3316e810bf7dceefe7ba05ac100eac1d98425c1fbac01d7eec921f3ec6d75abfa7cf507bab9622ca9e94d4aaa8b3a2dbe5c065d40ffd2b8657b4753