From 56f6030030147298b9fff8fa78f3e773a9e05cd223c3d10ae289a633a5cec3a3 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 11 Dec 2021 23:58:09 +0000 Subject: [PATCH] Accepting request 939984 from home:bnavigator:python-rpm-macros - Fix python310 failure due to moved collections.abc * add requests-toolbelt-pr246-collections.abc.patch * gh#requests/toolbelt#246 OBS-URL: https://build.opensuse.org/request/show/939984 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests-toolbelt?expand=0&rev=23 --- python-requests-toolbelt.changes | 7 ++++ python-requests-toolbelt.spec | 2 ++ requests-toolbelt-pr246-collections.abc.patch | 34 +++++++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 requests-toolbelt-pr246-collections.abc.patch diff --git a/python-requests-toolbelt.changes b/python-requests-toolbelt.changes index b911f0d..94eab41 100644 --- a/python-requests-toolbelt.changes +++ b/python-requests-toolbelt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 11 21:24:19 UTC 2021 - Ben Greiner + +- Fix python310 failure due to moved collections.abc + * add requests-toolbelt-pr246-collections.abc.patch + * gh#requests/toolbelt#246 + ------------------------------------------------------------------- Mon Nov 29 04:35:08 UTC 2021 - Steve Kowalik diff --git a/python-requests-toolbelt.spec b/python-requests-toolbelt.spec index fb8dd6c..6cf8806 100644 --- a/python-requests-toolbelt.spec +++ b/python-requests-toolbelt.spec @@ -31,6 +31,8 @@ Patch0: fix-tests.patch # PATCH-FIX-UPSTREAM remove_mock.patch bsc#[0-9]+ mcepl@suse.com # remove dependency on the external mock package Patch1: remove_mock.patch +# PATCH-FIX-UPSTREAM requests-toolbelt-pr246-collections.abc.patch -- fix python310 deprecation. gh#requests/toolbelt#246 +Patch2: https://github.com/requests/toolbelt/pull/246.patch#/requests-toolbelt-pr246-collections.abc.patch BuildRequires: %{python_module requests >= 2.12.2} BuildRequires: %{python_module setuptools} BuildRequires: fdupes diff --git a/requests-toolbelt-pr246-collections.abc.patch b/requests-toolbelt-pr246-collections.abc.patch new file mode 100644 index 0000000..13d6c7c --- /dev/null +++ b/requests-toolbelt-pr246-collections.abc.patch @@ -0,0 +1,34 @@ +From 7188b06330e5260be20bce8cbcf0d5ae44e34eaf Mon Sep 17 00:00:00 2001 +From: Jon Dufresne +Date: Fri, 1 Feb 2019 16:30:01 -0800 +Subject: [PATCH] Fix collections.abc deprecation warning in downloadutils + +Warning appears as: + +tests/test_downloadutils.py::test_stream_response_to_specific_filename + requests_toolbelt/downloadutils/stream.py:161: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working + if path and isinstance(getattr(path, 'write', None), collections.Callable): +--- + requests_toolbelt/downloadutils/stream.py | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/requests_toolbelt/downloadutils/stream.py b/requests_toolbelt/downloadutils/stream.py +index eed60a7..1d1c31b 100644 +--- a/requests_toolbelt/downloadutils/stream.py ++++ b/requests_toolbelt/downloadutils/stream.py +@@ -1,6 +1,5 @@ + # -*- coding: utf-8 -*- + """Utilities for dealing with streamed requests.""" +-import collections + import os.path + import re + +@@ -158,7 +157,7 @@ def stream_response_to_file(response, path=None, chunksize=_DEFAULT_CHUNKSIZE): + pre_opened = False + fd = None + filename = None +- if path and isinstance(getattr(path, 'write', None), collections.Callable): ++ if path and callable(getattr(path, 'write', None)): + pre_opened = True + fd = path + filename = getattr(fd, 'name', None)