diff --git a/SOURCES/import-urllib3-and-chardet-from-the-global-namespace.patch b/SOURCES/import-urllib3-and-chardet-from-the-global-namespace.patch index c39ca26..fecebde 100644 --- a/SOURCES/import-urllib3-and-chardet-from-the-global-namespace.patch +++ b/SOURCES/import-urllib3-and-chardet-from-the-global-namespace.patch @@ -108,3 +108,16 @@ index 9a51f33..22bd226 100644 from .structures import CaseInsensitiveDict from .adapters import HTTPAdapter +diff --git a/test_requests.py b/test_requests.py +index cf7c722..690b3ed 100755 +--- a/test_requests.py ++++ b/test_requests.py +@@ -1655,7 +1655,7 @@ def test_prepare_unicode_url(): + + + def test_urllib3_retries(): +- from requests.packages.urllib3.util import Retry ++ from urllib3.util import Retry + s = requests.Session() + s.mount('http://', HTTPAdapter(max_retries=Retry( + total=2, status_forcelist=[500] diff --git a/SPECS/python-requests.spec b/SPECS/python-requests.spec index 9b5beeb..50d9d3a 100644 --- a/SPECS/python-requests.spec +++ b/SPECS/python-requests.spec @@ -9,7 +9,7 @@ Name: python-requests Version: 2.6.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: HTTP library, written in Python, for human beings License: ASL 2.0 @@ -184,9 +184,13 @@ popd %endif %changelog +* Tue Mar 10 2020 Charalampos Stratakis - 2.6.0-10 +- Fix test_urllib3_retries by having it import urllib3 from the global namespace +Resolves: rhbz#1771567 + * Wed Feb 19 2020 Charalampos Stratakis - 2.6.0-9 - Bring back the requests.packages aliasing of its submodules -Resolves: rhbz#1811051, rhbz#1811058, rhbz#1811108, rhbz#1811114 +Resolves: rhbz#1785607, rhbz#1785666, rhbz#1785696, rhbz#1787679 * Thu Oct 24 2019 Charalampos Stratakis - 2.6.0-8 - Import urllib3 and chardet from the global namespace