From 9f7b35634943e510d81d6d5d268cdf05c25da0d2 Mon Sep 17 00:00:00 2001
From: Lukáš Zaoral <lzaoral@redhat.com>
Date: May 03 2022 14:44:03 +0000
Subject: fix failing test-suite with curl 7.83+


---

diff --git a/0002-python-pycurl-7.45.1-curl-7.83-compatibility.patch b/0002-python-pycurl-7.45.1-curl-7.83-compatibility.patch
new file mode 100644
index 0000000..cb9c5ee
--- /dev/null
+++ b/0002-python-pycurl-7.45.1-curl-7.83-compatibility.patch
@@ -0,0 +1,40 @@
+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:
diff --git a/python-pycurl.spec b/python-pycurl.spec
index bbabe9d..d39d90b 100644
--- a/python-pycurl.spec
+++ b/python-pycurl.spec
@@ -23,7 +23,7 @@
 
 Name:           python-%{modname}
 Version:        7.45.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python interface to libcurl
 
 License:        LGPLv2+ or MIT
@@ -32,6 +32,8 @@ Source0:        https://files.pythonhosted.org/packages/47/f9/c41d6830f7bd4e70d5
 
 # 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
@@ -161,6 +163,9 @@ rm -fvr tests/__pycache__
 %endif
 
 %changelog
+* Tue May 03 2022 Lukáš Zaoral <lzaoral@redhat.com> - 7.45.1-2
+- fix failing test-suite with curl 7.83+
+
 * Tue Mar 15 2022 Lukáš Zaoral <lzaoral@redhat.com> - 7.45.1-1
 - update to 7.45.1 (#2062500)
 - do not ship tests/__pycache__