diff --git a/python-requests-toolbelt.changes b/python-requests-toolbelt.changes index 7856328..5312857 100644 --- a/python-requests-toolbelt.changes +++ b/python-requests-toolbelt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 13 21:51:50 UTC 2020 - Matej Cepl + +- We don't need to break Python 2.7 + ------------------------------------------------------------------- Mon Dec 7 08:09:35 UTC 2020 - Matej Cepl diff --git a/python-requests-toolbelt.spec b/python-requests-toolbelt.spec index 81f52e2..0d049f4 100644 --- a/python-requests-toolbelt.spec +++ b/python-requests-toolbelt.spec @@ -37,8 +37,12 @@ Requires: python-requests >= 2.12.2 BuildArch: noarch # SECTION test requirements BuildRequires: %{python_module betamax >= 0.5.0} -BuildRequires: %{python_module pyOpenSSL} +# gh#pyca/cryptography#5606 +BuildRequires: %{python_module pyOpenSSL >= 19.1.0} BuildRequires: %{python_module pytest} +%ifpython2 +BuildRequires: %{python_module mock} +%endif # /SECTION %python_subpackages diff --git a/remove_mock.patch b/remove_mock.patch index 138c661..5c3bf86 100644 --- a/remove_mock.patch +++ b/remove_mock.patch @@ -16,119 +16,152 @@ --- a/tests/test_appengine_adapter.py +++ b/tests/test_appengine_adapter.py -@@ -2,7 +2,7 @@ +@@ -2,7 +2,10 @@ """Tests for the AppEngineAdapter.""" import sys -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import pytest import requests --- a/tests/test_auth.py +++ b/tests/test_auth.py -@@ -1,7 +1,7 @@ +@@ -1,7 +1,10 @@ # -*- coding: utf-8 -*- import requests import unittest -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock from requests_toolbelt.auth.guess import GuessAuth, GuessProxyAuth from . import get_betamax --- a/tests/test_downloadutils.py +++ b/tests/test_downloadutils.py -@@ -8,7 +8,7 @@ import tempfile +@@ -8,7 +8,10 @@ import tempfile import requests from requests_toolbelt.downloadutils import stream from requests_toolbelt.downloadutils import tee -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import pytest from . import get_betamax --- a/tests/test_dump.py +++ b/tests/test_dump.py -@@ -12,7 +12,7 @@ very complex and high-level. +@@ -12,7 +12,10 @@ very complex and high-level. from requests_toolbelt._compat import HTTPHeaderDict from requests_toolbelt.utils import dump -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import pytest import requests --- a/tests/test_multipart_decoder.py +++ b/tests/test_multipart_decoder.py -@@ -2,7 +2,7 @@ +@@ -2,7 +2,10 @@ import io import sys import unittest -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import pytest import requests from requests_toolbelt.multipart.decoder import BodyPart --- a/tests/test_proxy_digest_auth.py +++ b/tests/test_proxy_digest_auth.py -@@ -2,7 +2,7 @@ +@@ -2,7 +2,10 @@ """Test proxy digest authentication.""" import unittest -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import requests from requests_toolbelt.auth import http_proxy_digest --- a/tests/test_socket_options_adapter.py +++ b/tests/test_socket_options_adapter.py -@@ -3,7 +3,7 @@ +@@ -3,7 +3,10 @@ import contextlib import socket -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import requests from requests_toolbelt._compat import poolmanager --- a/tests/test_ssladapter.py +++ b/tests/test_ssladapter.py -@@ -1,5 +1,5 @@ +@@ -1,5 +1,8 @@ # -*- coding: utf-8 -*- -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import pytest import requests import unittest --- a/tests/threaded/test_api.py +++ b/tests/threaded/test_api.py -@@ -1,6 +1,6 @@ +@@ -1,6 +1,9 @@ """Module containing tests for requests_toolbelt.threaded API.""" -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import pytest from requests_toolbelt._compat import queue --- a/tests/threaded/test_pool.py +++ b/tests/threaded/test_pool.py -@@ -5,7 +5,7 @@ except ImportError: +@@ -5,7 +5,10 @@ except ImportError: import Queue as queue import unittest -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import pytest from requests_toolbelt.threaded import pool --- a/tests/threaded/test_thread.py +++ b/tests/threaded/test_thread.py -@@ -7,7 +7,7 @@ import threading +@@ -7,7 +7,10 @@ import threading import unittest import uuid -import mock -+from unittest import mock ++try: ++ import unittest.mock as mock ++except ImportError: ++ import mock import requests.exceptions from requests_toolbelt.threaded import thread @@ -151,22 +184,28 @@ betamax>0.5.0 --- a/tests/test_source_adapter.py +++ b/tests/test_source_adapter.py -@@ -1,6 +1,6 @@ +@@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- from requests.adapters import DEFAULT_POOLSIZE, DEFAULT_POOLBLOCK -from mock import patch -+from unittest.mock import patch ++try: ++ from unittest.mock import patch ++except ImportError: ++ from mock import patch from requests_toolbelt.adapters.source import SourceAddressAdapter import pytest --- a/tests/test_user_agent.py +++ b/tests/test_user_agent.py -@@ -2,7 +2,7 @@ +@@ -2,7 +2,10 @@ import unittest import sys -from mock import patch -+from unittest.mock import patch ++try: ++ from unittest.mock import patch ++except ImportError: ++ from mock import patch import pytest from requests_toolbelt.utils import user_agent as ua