1 --- urllib3-1.24.1/docs/conf.py.orig 2018-10-05 23:00:05.000000000 +0200
2 +++ urllib3-1.24.1/docs/conf.py 2018-12-02 09:35:52.593757249 +0100
4 # Mock some expensive/platform-specific modules so build will work.
5 # (https://read-the-docs.readthedocs.io/en/latest/faq.html#\
6 # i-get-import-errors-on-libraries-that-depend-on-c-modules)
11 + from unittest import mock
14 class MockModule(mock.Mock):
15 --- urllib3-1.26.2/test/test_connection.py.orig 2021-01-17 21:03:32.174782572 +0100
16 +++ urllib3-1.26.2/test/test_connection.py 2021-01-17 21:06:45.107070701 +0100
24 + from unittest import mock
27 from urllib3.connection import RECENT_DATE, CertificateError, _match_hostname
28 --- urllib3-1.26.2/test/test_queue_monkeypatch.py.orig 2021-01-17 21:03:32.174782572 +0100
29 +++ urllib3-1.26.2/test/test_queue_monkeypatch.py 2021-01-17 21:07:04.446965928 +0100
31 from __future__ import absolute_import
37 + from unittest import mock
40 from urllib3 import HTTPConnectionPool
41 --- urllib3-1.26.2/test/test_response.py.orig 2021-01-17 21:03:32.174782572 +0100
42 +++ urllib3-1.26.2/test/test_response.py 2021-01-17 21:07:27.800172746 +0100
44 from io import BufferedReader, BytesIO, TextIOWrapper
45 from test import onlyBrotlipy
51 + from unittest import mock
55 --- urllib3-1.26.2/test/test_retry.py.orig 2021-01-17 21:03:32.174782572 +0100
56 +++ urllib3-1.26.2/test/test_retry.py 2021-01-17 21:07:44.043418082 +0100
64 + from unittest import mock
67 from urllib3.exceptions import (
68 --- urllib3-1.26.2/test/test_ssl.py.orig 2021-01-17 21:03:32.174782572 +0100
69 +++ urllib3-1.26.2/test/test_ssl.py 2021-01-17 21:07:59.646666886 +0100
71 from test import notPyPy2
77 + from unittest import mock
80 from urllib3.exceptions import SNIMissingWarning
81 --- urllib3-1.26.2/test/test_util.py.orig 2021-01-17 21:03:32.178115887 +0100
82 +++ urllib3-1.26.2/test/test_util.py 2021-01-17 21:08:29.376505825 +0100
84 from test import notBrotlipy, onlyBrotlipy, onlyPy2, onlyPy3
87 -from mock import Mock, patch
89 + from mock import Mock, patch
91 + from unittest.mock import Mock, patch
93 from urllib3 import add_stderr_logger, disable_warnings, util
94 from urllib3.exceptions import (
95 --- urllib3-1.25.9/test/contrib/test_pyopenssl.py.orig 2020-04-16 14:42:30.000000000 +0200
96 +++ urllib3-1.25.9/test/contrib/test_pyopenssl.py 2020-06-07 22:30:33.011793894 +0200
98 # -*- coding: utf-8 -*-
105 + from unittest import mock
109 --- urllib3-1.26.2/test/contrib/test_pyopenssl_dependencies.py.orig 2021-01-17 21:10:14.782601458 +0100
110 +++ urllib3-1.26.2/test/contrib/test_pyopenssl_dependencies.py 2021-01-17 21:12:17.745268645 +0100
112 # -*- coding: utf-8 -*-
114 -from mock import Mock, patch
116 + from mock import Mock, patch
118 + from unittest.mock import Mock, patch
121 from urllib3.contrib.pyopenssl import extract_from_urllib3, inject_into_urllib3
122 --- urllib3-1.26.2/test/with_dummyserver/test_connectionpool.py.orig 2021-01-17 21:10:14.782601458 +0100
123 +++ urllib3-1.26.2/test/with_dummyserver/test_connectionpool.py 2021-01-17 21:12:56.965056174 +0100
125 from test import LONG_TIMEOUT, SHORT_TIMEOUT, onlyPy2
126 from threading import Event
132 + from unittest import mock
136 --- urllib3-1.26.8/test/with_dummyserver/test_https.py.orig 2022-03-10 06:29:38.588432315 +0100
137 +++ urllib3-1.26.8/test/with_dummyserver/test_https.py 2022-03-10 06:30:20.714870763 +0100
138 @@ -19,7 +19,10 @@ from test import (
139 resolvesLocalhostFQDN,
146 + from unittest import mock
150 --- urllib3-1.26.2/test/with_dummyserver/test_socketlevel.py.orig 2021-01-17 21:10:14.782601458 +0100
151 +++ urllib3-1.26.2/test/with_dummyserver/test_socketlevel.py 2021-01-17 21:18:48.833149940 +0100
154 from threading import Event
160 + from unittest import mock