update to 7.45.2

Resolves: #2062500
This commit is contained in:
Kamil Dudka 2022-12-16 22:00:07 +01:00
parent c47fe23f9e
commit c44572d8da
3 changed files with 7 additions and 46 deletions

View File

@ -1,40 +0,0 @@
From d47c68b1364f8a1a45ab8c584c291d44b762f7b1 Mon Sep 17 00:00:00 2001
From: Samuel Henrique <samueloph@debian.org>
Date: Sat, 30 Apr 2022 23:02:34 +0100
Subject: [PATCH] tests: fix error message on error_test (for curl >= 7.83)
curl 7.83.0 removed exclamation marks from a few error messages, curl commit:
https://github.com/curl/curl/commit/6968fb9d54dc3a1aaa1b16088f038eaf5dd8b2d7
This commit adds support for the new curl release while also supporting the previous ones.
---
tests/error_test.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/error_test.py b/tests/error_test.py
index 01d0ac5ee..f32b693cb 100644
--- a/tests/error_test.py
+++ b/tests/error_test.py
@@ -29,7 +29,8 @@ def test_pycurl_error_libcurl(self):
err, msg = exc.args
self.assertEqual(pycurl.E_URL_MALFORMAT, err)
# possibly fragile
- self.assertEqual('No URL set!', msg)
+ # curl < 7.83.0 has an exclamation mark in this error message
+ self.assertIn(msg, ['No URL set!', 'No URL set'])
else:
self.fail('Expected pycurl.error to be raised')
@@ -43,9 +44,10 @@ def test_pycurl_errstr_type(self):
self.curl.perform()
except pycurl.error:
# might be fragile
- self.assertEqual('No URL set!', self.curl.errstr())
+ # curl < 7.83.0 has an exclamation mark in this error message
+ self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
# repeated checks do not clear value
- self.assertEqual('No URL set!', self.curl.errstr())
+ self.assertIn(self.curl.errstr(), ['No URL set!', 'No URL set'])
# check the type - on all python versions
self.assertEqual(str, type(self.curl.errstr()))
else:

View File

@ -22,18 +22,16 @@
%global modname pycurl
Name: python-%{modname}
Version: 7.45.1
Release: 4%{?dist}
Version: 7.45.2
Release: 1%{?dist}
Summary: A Python interface to libcurl
License: LGPLv2+ or MIT
URL: http://pycurl.io/
Source0: https://files.pythonhosted.org/packages/47/f9/c41d6830f7bd4e70d5726d26f8564538d08ca3a7ac3db98b325f94cdcb7f/pycurl-%{version}.tar.gz
Source0: https://files.pythonhosted.org/packages/a8/af/24d3acfa76b867dbd8f1166853c18eefc890fc5da03a48672b38ea77ddae/pycurl-7.45.2.tar.gz
# drop link-time vs. run-time TLS backend check (#1446850)
Patch1: 0001-python-pycurl-7.45.1-tls-backend.patch
# https://github.com/pycurl/pycurl/pull/753
Patch2: 0002-python-pycurl-7.45.1-curl-7.83-compatibility.patch
BuildRequires: gcc
BuildRequires: libcurl-devel
@ -163,6 +161,9 @@ rm -fvr tests/__pycache__
%endif
%changelog
* Fri Dec 16 2022 Kamil Dudka <kdudka@redhat.com> - 7.45.2-1
- update to 7.45.2 (#2154427)
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.45.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (pycurl-7.45.1.tar.gz) = 05639d484aac6d6688677589e391975158c5ef778456a47df575ad13fb8bd0db67ff8f5a39bdd99d82a67926aca421c01e687eec9d4fd87f32822b492b429635
SHA512 (pycurl-7.45.2.tar.gz) = 8a82346395acfc0bd37a8c4d8d2b17e5ab4602710308ed50f9ed88c223c73f15f5b1c95fc6191708e3bd9d647e4bc5ec91f740de433dd87e2ae0796ac79879ac