- refresh remove_mock.patch with extra mock usages
- Remove unneeded BuildRequires of mock. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=135
This commit is contained in:
Git OBS Bridge
parent
aecb18b5a2
commit
b5aef7fbb3
@ -5,11 +5,12 @@ Sun Jul 24 08:02:24 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
* Removed support for Python 3.5
|
||||
* Fixed an issue where a ``ProxyError`` recommending configuring the proxy as HTTP
|
||||
instead of HTTPS could appear even when an HTTPS proxy wasn't configured.
|
||||
- refresh remove_mock.patch with extra mock usages
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 19 05:34:17 UTC 2022 - Steve Kowalik <steven.kowalik@suse.com>
|
||||
|
||||
- Remove unneeded BuildRequires of mock.
|
||||
- Remove unneeded BuildRequires of mock.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 5 19:54:39 UTC 2022 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Index: urllib3-1.26.3/docs/conf.py
|
||||
Index: urllib3-1.26.10/docs/conf.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/docs/conf.py
|
||||
+++ urllib3-1.26.3/docs/conf.py
|
||||
--- urllib3-1.26.10.orig/docs/conf.py
|
||||
+++ urllib3-1.26.10/docs/conf.py
|
||||
@@ -14,7 +14,10 @@ sys.path.insert(0, root_path)
|
||||
# Mock some expensive/platform-specific modules so build will work.
|
||||
# (https://read-the-docs.readthedocs.io/en/latest/faq.html#\
|
||||
@ -14,26 +14,10 @@ Index: urllib3-1.26.3/docs/conf.py
|
||||
|
||||
|
||||
class MockModule(mock.Mock):
|
||||
Index: urllib3-1.26.3/test/appengine/test_urlfetch.py
|
||||
Index: urllib3-1.26.10/test/contrib/test_pyopenssl.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/appengine/test_urlfetch.py
|
||||
+++ urllib3-1.26.3/test/appengine/test_urlfetch.py
|
||||
@@ -5,7 +5,10 @@ Engine-patched version of httplib to mak
|
||||
import httplib
|
||||
import pytest
|
||||
import StringIO
|
||||
-from mock import patch
|
||||
+try:
|
||||
+ from unittest.mock import patch
|
||||
+except ImportError:
|
||||
+ from mock import patch
|
||||
|
||||
from ..test_no_ssl import TestWithoutSSL
|
||||
|
||||
Index: urllib3-1.26.3/test/contrib/test_pyopenssl.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/contrib/test_pyopenssl.py
|
||||
+++ urllib3-1.26.3/test/contrib/test_pyopenssl.py
|
||||
--- urllib3-1.26.10.orig/test/contrib/test_pyopenssl.py
|
||||
+++ urllib3-1.26.10/test/contrib/test_pyopenssl.py
|
||||
@@ -1,7 +1,10 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import os
|
||||
@ -46,10 +30,10 @@ Index: urllib3-1.26.3/test/contrib/test_pyopenssl.py
|
||||
import pytest
|
||||
|
||||
try:
|
||||
Index: urllib3-1.26.3/test/contrib/test_pyopenssl_dependencies.py
|
||||
Index: urllib3-1.26.10/test/contrib/test_pyopenssl_dependencies.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/contrib/test_pyopenssl_dependencies.py
|
||||
+++ urllib3-1.26.3/test/contrib/test_pyopenssl_dependencies.py
|
||||
--- urllib3-1.26.10.orig/test/contrib/test_pyopenssl_dependencies.py
|
||||
+++ urllib3-1.26.10/test/contrib/test_pyopenssl_dependencies.py
|
||||
@@ -1,6 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import pytest
|
||||
@ -61,10 +45,10 @@ Index: urllib3-1.26.3/test/contrib/test_pyopenssl_dependencies.py
|
||||
|
||||
try:
|
||||
from urllib3.contrib.pyopenssl import extract_from_urllib3, inject_into_urllib3
|
||||
Index: urllib3-1.26.3/test/test_connection.py
|
||||
Index: urllib3-1.26.10/test/test_connection.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/test_connection.py
|
||||
+++ urllib3-1.26.3/test/test_connection.py
|
||||
--- urllib3-1.26.10.orig/test/test_connection.py
|
||||
+++ urllib3-1.26.10/test/test_connection.py
|
||||
@@ -1,6 +1,9 @@
|
||||
import datetime
|
||||
|
||||
@ -76,10 +60,10 @@ Index: urllib3-1.26.3/test/test_connection.py
|
||||
import pytest
|
||||
|
||||
from urllib3.connection import RECENT_DATE, CertificateError, _match_hostname
|
||||
Index: urllib3-1.26.3/test/test_connectionpool.py
|
||||
Index: urllib3-1.26.10/test/test_connectionpool.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/test_connectionpool.py
|
||||
+++ urllib3-1.26.3/test/test_connectionpool.py
|
||||
--- urllib3-1.26.10.orig/test/test_connectionpool.py
|
||||
+++ urllib3-1.26.10/test/test_connectionpool.py
|
||||
@@ -6,7 +6,10 @@ from ssl import SSLError as BaseSSLError
|
||||
from test import SHORT_TIMEOUT
|
||||
|
||||
@ -92,10 +76,10 @@ Index: urllib3-1.26.3/test/test_connectionpool.py
|
||||
|
||||
from dummyserver.server import DEFAULT_CA
|
||||
from urllib3._collections import HTTPHeaderDict
|
||||
Index: urllib3-1.26.3/test/test_queue_monkeypatch.py
|
||||
Index: urllib3-1.26.10/test/test_queue_monkeypatch.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/test_queue_monkeypatch.py
|
||||
+++ urllib3-1.26.3/test/test_queue_monkeypatch.py
|
||||
--- urllib3-1.26.10.orig/test/test_queue_monkeypatch.py
|
||||
+++ urllib3-1.26.10/test/test_queue_monkeypatch.py
|
||||
@@ -1,6 +1,9 @@
|
||||
from __future__ import absolute_import
|
||||
|
||||
@ -107,10 +91,10 @@ Index: urllib3-1.26.3/test/test_queue_monkeypatch.py
|
||||
import pytest
|
||||
|
||||
from urllib3 import HTTPConnectionPool
|
||||
Index: urllib3-1.26.3/test/test_response.py
|
||||
Index: urllib3-1.26.10/test/test_response.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/test_response.py
|
||||
+++ urllib3-1.26.3/test/test_response.py
|
||||
--- urllib3-1.26.10.orig/test/test_response.py
|
||||
+++ urllib3-1.26.10/test/test_response.py
|
||||
@@ -9,7 +9,10 @@ from base64 import b64decode
|
||||
from io import BufferedReader, BytesIO, TextIOWrapper
|
||||
from test import onlyBrotlipy
|
||||
@ -123,10 +107,10 @@ Index: urllib3-1.26.3/test/test_response.py
|
||||
import pytest
|
||||
import six
|
||||
|
||||
Index: urllib3-1.26.3/test/test_retry.py
|
||||
Index: urllib3-1.26.10/test/test_retry.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/test_retry.py
|
||||
+++ urllib3-1.26.3/test/test_retry.py
|
||||
--- urllib3-1.26.10.orig/test/test_retry.py
|
||||
+++ urllib3-1.26.10/test/test_retry.py
|
||||
@@ -1,6 +1,9 @@
|
||||
import warnings
|
||||
|
||||
@ -138,10 +122,10 @@ Index: urllib3-1.26.3/test/test_retry.py
|
||||
import pytest
|
||||
|
||||
from urllib3.exceptions import (
|
||||
Index: urllib3-1.26.3/test/test_retry_deprecated.py
|
||||
Index: urllib3-1.26.10/test/test_retry_deprecated.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/test_retry_deprecated.py
|
||||
+++ urllib3-1.26.3/test/test_retry_deprecated.py
|
||||
--- urllib3-1.26.10.orig/test/test_retry_deprecated.py
|
||||
+++ urllib3-1.26.10/test/test_retry_deprecated.py
|
||||
@@ -1,7 +1,10 @@
|
||||
# This is a copy-paste of test_retry.py with extra asserts about deprecated options. It will be removed for v2.
|
||||
import warnings
|
||||
@ -154,10 +138,10 @@ Index: urllib3-1.26.3/test/test_retry_deprecated.py
|
||||
import pytest
|
||||
|
||||
from urllib3.exceptions import (
|
||||
Index: urllib3-1.26.3/test/test_ssl.py
|
||||
Index: urllib3-1.26.10/test/test_ssl.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/test_ssl.py
|
||||
+++ urllib3-1.26.3/test/test_ssl.py
|
||||
--- urllib3-1.26.10.orig/test/test_ssl.py
|
||||
+++ urllib3-1.26.10/test/test_ssl.py
|
||||
@@ -1,6 +1,9 @@
|
||||
from test import notPyPy2
|
||||
|
||||
@ -169,10 +153,10 @@ Index: urllib3-1.26.3/test/test_ssl.py
|
||||
import pytest
|
||||
|
||||
from urllib3.exceptions import SNIMissingWarning
|
||||
Index: urllib3-1.26.3/test/test_ssltransport.py
|
||||
Index: urllib3-1.26.10/test/test_ssltransport.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/test_ssltransport.py
|
||||
+++ urllib3-1.26.3/test/test_ssltransport.py
|
||||
--- urllib3-1.26.10.orig/test/test_ssltransport.py
|
||||
+++ urllib3-1.26.10/test/test_ssltransport.py
|
||||
@@ -4,7 +4,10 @@ import socket
|
||||
import ssl
|
||||
import sys
|
||||
@ -185,10 +169,10 @@ Index: urllib3-1.26.3/test/test_ssltransport.py
|
||||
import pytest
|
||||
|
||||
from dummyserver.server import DEFAULT_CA, DEFAULT_CERTS
|
||||
Index: urllib3-1.26.3/test/test_util.py
|
||||
Index: urllib3-1.26.10/test/test_util.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/test_util.py
|
||||
+++ urllib3-1.26.3/test/test_util.py
|
||||
--- urllib3-1.26.10.orig/test/test_util.py
|
||||
+++ urllib3-1.26.10/test/test_util.py
|
||||
@@ -9,7 +9,10 @@ from itertools import chain
|
||||
from test import notBrotlipy, onlyBrotlipy, onlyPy2, onlyPy3
|
||||
|
||||
@ -201,11 +185,11 @@ Index: urllib3-1.26.3/test/test_util.py
|
||||
|
||||
from urllib3 import add_stderr_logger, disable_warnings, util
|
||||
from urllib3.exceptions import (
|
||||
Index: urllib3-1.26.3/test/with_dummyserver/test_connectionpool.py
|
||||
Index: urllib3-1.26.10/test/with_dummyserver/test_connectionpool.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/with_dummyserver/test_connectionpool.py
|
||||
+++ urllib3-1.26.3/test/with_dummyserver/test_connectionpool.py
|
||||
@@ -10,7 +10,10 @@ import warnings
|
||||
--- urllib3-1.26.10.orig/test/with_dummyserver/test_connectionpool.py
|
||||
+++ urllib3-1.26.10/test/with_dummyserver/test_connectionpool.py
|
||||
@@ -12,7 +12,10 @@ import warnings
|
||||
from test import LONG_TIMEOUT, SHORT_TIMEOUT, onlyPy2
|
||||
from threading import Event
|
||||
|
||||
@ -217,11 +201,11 @@ Index: urllib3-1.26.3/test/with_dummyserver/test_connectionpool.py
|
||||
import pytest
|
||||
import six
|
||||
|
||||
Index: urllib3-1.26.3/test/with_dummyserver/test_https.py
|
||||
Index: urllib3-1.26.10/test/with_dummyserver/test_https.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/with_dummyserver/test_https.py
|
||||
+++ urllib3-1.26.3/test/with_dummyserver/test_https.py
|
||||
@@ -19,7 +19,10 @@ from test import (
|
||||
--- urllib3-1.26.10.orig/test/with_dummyserver/test_https.py
|
||||
+++ urllib3-1.26.10/test/with_dummyserver/test_https.py
|
||||
@@ -18,7 +18,10 @@ from test import (
|
||||
resolvesLocalhostFQDN,
|
||||
)
|
||||
|
||||
@ -233,11 +217,11 @@ Index: urllib3-1.26.3/test/with_dummyserver/test_https.py
|
||||
import pytest
|
||||
import trustme
|
||||
|
||||
Index: urllib3-1.26.3/test/with_dummyserver/test_socketlevel.py
|
||||
Index: urllib3-1.26.10/test/with_dummyserver/test_socketlevel.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.3.orig/test/with_dummyserver/test_socketlevel.py
|
||||
+++ urllib3-1.26.3/test/with_dummyserver/test_socketlevel.py
|
||||
@@ -52,7 +52,10 @@ from test import (
|
||||
--- urllib3-1.26.10.orig/test/with_dummyserver/test_socketlevel.py
|
||||
+++ urllib3-1.26.10/test/with_dummyserver/test_socketlevel.py
|
||||
@@ -53,7 +53,10 @@ from test import (
|
||||
)
|
||||
from threading import Event
|
||||
|
||||
@ -249,3 +233,29 @@ Index: urllib3-1.26.3/test/with_dummyserver/test_socketlevel.py
|
||||
import pytest
|
||||
import trustme
|
||||
|
||||
Index: urllib3-1.26.10/test/test_poolmanager.py
|
||||
===================================================================
|
||||
--- urllib3-1.26.10.orig/test/test_poolmanager.py
|
||||
+++ urllib3-1.26.10/test/test_poolmanager.py
|
||||
@@ -2,7 +2,11 @@ import socket
|
||||
from test import resolvesLocalhostFQDN
|
||||
|
||||
import pytest
|
||||
-from mock import patch
|
||||
+
|
||||
+try:
|
||||
+ import unittest.mock as mock
|
||||
+except ImportError:
|
||||
+ import mock
|
||||
|
||||
from urllib3 import connection_from_url
|
||||
from urllib3.exceptions import ClosedPoolError, LocationValueError
|
||||
@@ -383,7 +387,7 @@ class TestPoolManager(object):
|
||||
"http://[a::b%25zone]",
|
||||
],
|
||||
)
|
||||
- @patch("urllib3.util.connection.create_connection")
|
||||
+ @mock.patch("urllib3.util.connection.create_connection")
|
||||
def test_e2e_connect_to_ipv6_scoped(self, create_connection, url):
|
||||
"""Checks that IPv6 scoped addresses are properly handled end-to-end.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user