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.25.9/test/test_connection.py.orig 2020-04-16 14:42:30.000000000 +0200
16 +++ urllib3-1.25.9/test/test_connection.py 2020-06-07 22:20:50.841614447 +0200
23 + from unittest import mock
27 --- urllib3-1.25.9/test/test_queue_monkeypatch.py.orig 2020-04-16 14:42:30.000000000 +0200
28 +++ urllib3-1.25.9/test/test_queue_monkeypatch.py 2020-06-07 22:31:23.954851245 +0200
30 from __future__ import absolute_import
36 + from unittest import mock
40 --- urllib3-1.25.9/test/test_response.py.orig 2020-04-16 14:42:30.000000000 +0200
41 +++ urllib3-1.25.9/test/test_response.py 2020-06-07 22:25:48.023337809 +0200
43 from io import BytesIO, BufferedReader, TextIOWrapper
50 + from unittest import mock
53 from urllib3.response import HTTPResponse, brotli
54 --- urllib3-1.25.9/test/test_retry.py.orig 2020-04-16 14:42:30.000000000 +0200
55 +++ urllib3-1.25.9/test/test_retry.py 2020-06-07 22:21:45.327985936 +0200
62 + from unittest import mock
66 --- urllib3-1.25.9/test/test_ssl.py.orig 2020-04-16 14:42:30.000000000 +0200
67 +++ urllib3-1.25.9/test/test_ssl.py 2020-06-07 22:22:15.301156891 +0200
73 + from unittest import mock
75 from urllib3.util import ssl_
76 from urllib3.exceptions import SNIMissingWarning
77 --- urllib3-1.25.9/test/test_util.py.orig 2020-04-16 14:42:30.000000000 +0200
78 +++ urllib3-1.25.9/test/test_util.py 2020-06-07 22:21:18.341465468 +0200
81 from itertools import chain
83 -from mock import patch, Mock
85 + from mock import patch, Mock
87 + from unittest.mock import patch, Mock
90 from urllib3 import add_stderr_logger, disable_warnings
91 --- urllib3-1.25.9/test/contrib/test_pyopenssl.py.orig 2020-04-16 14:42:30.000000000 +0200
92 +++ urllib3-1.25.9/test/contrib/test_pyopenssl.py 2020-06-07 22:30:33.011793894 +0200
94 # -*- coding: utf-8 -*-
101 + from unittest import mock
105 --- urllib3-1.25.9/test/contrib/test_pyopenssl_dependencies.py.orig 2020-04-16 14:42:30.000000000 +0200
106 +++ urllib3-1.25.9/test/contrib/test_pyopenssl_dependencies.py 2020-06-07 22:31:07.291608185 +0200
108 # -*- coding: utf-8 -*-
111 -from mock import patch, Mock
113 + from mock import patch, Mock
115 + from unittest.mock import patch, Mock
118 from urllib3.contrib.pyopenssl import inject_into_urllib3, extract_from_urllib3
119 --- urllib3-1.25.9/test/with_dummyserver/test_connectionpool.py.orig 2020-04-16 14:42:30.000000000 +0200
120 +++ urllib3-1.25.9/test/with_dummyserver/test_connectionpool.py 2020-06-07 22:20:19.205119170 +0200
129 + from unittest import mock
131 from .. import TARPIT_HOST, VALID_SOURCE_ADDRESSES, INVALID_SOURCE_ADDRESSES
132 from ..port_helpers import find_unused_port
133 --- urllib3-1.25.9/test/with_dummyserver/test_https.py.orig 2020-04-16 14:42:30.000000000 +0200
134 +++ urllib3-1.25.9/test/with_dummyserver/test_https.py 2020-06-07 22:18:03.172522789 +0200
143 + from unittest import mock
147 --- urllib3-1.25.9/test/with_dummyserver/test_socketlevel.py.orig 2020-04-16 14:42:30.000000000 +0200
148 +++ urllib3-1.25.9/test/with_dummyserver/test_socketlevel.py 2020-06-07 22:18:29.705712380 +0200
157 + from unittest import mock