python-urllib3/remove_mock.patch

Index: urllib3-1.26.3/docs/conf.py
===================================================================
--- urllib3-1.26.3.orig/docs/conf.py
+++ urllib3-1.26.3/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#\
 #  i-get-import-errors-on-libraries-that-depend-on-c-modules)
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 
 
 class MockModule(mock.Mock):
Index: urllib3-1.26.3/test/appengine/test_urlfetch.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
@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 import os
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 try:
Index: urllib3-1.26.3/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
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 import pytest
-from mock import Mock, patch
+try:
+    from unittest.mock import Mock, patch
+except ImportError:
+    from mock import Mock, patch
 
 try:
     from urllib3.contrib.pyopenssl import extract_from_urllib3, inject_into_urllib3
Index: urllib3-1.26.3/test/test_connection.py
===================================================================
--- urllib3-1.26.3.orig/test/test_connection.py
+++ urllib3-1.26.3/test/test_connection.py
@@ -1,6 +1,9 @@
 import datetime
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from urllib3.connection import RECENT_DATE, CertificateError, _match_hostname
Index: urllib3-1.26.3/test/test_connectionpool.py
===================================================================
--- urllib3-1.26.3.orig/test/test_connectionpool.py
+++ urllib3-1.26.3/test/test_connectionpool.py
@@ -6,7 +6,10 @@ from ssl import SSLError as BaseSSLError
 from test import SHORT_TIMEOUT
 
 import pytest
-from mock import Mock
+try:
+    from unittest.mock import Mock
+except ImportError:
+    from mock import Mock
 
 from dummyserver.server import DEFAULT_CA
 from urllib3._collections import HTTPHeaderDict
Index: urllib3-1.26.3/test/test_queue_monkeypatch.py
===================================================================
--- urllib3-1.26.3.orig/test/test_queue_monkeypatch.py
+++ urllib3-1.26.3/test/test_queue_monkeypatch.py
@@ -1,6 +1,9 @@
 from __future__ import absolute_import
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from urllib3 import HTTPConnectionPool
Index: urllib3-1.26.3/test/test_response.py
===================================================================
--- urllib3-1.26.3.orig/test/test_response.py
+++ urllib3-1.26.3/test/test_response.py
@@ -9,7 +9,10 @@ from base64 import b64decode
 from io import BufferedReader, BytesIO, TextIOWrapper
 from test import onlyBrotlipy
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 import six
 
Index: urllib3-1.26.3/test/test_retry.py
===================================================================
--- urllib3-1.26.3.orig/test/test_retry.py
+++ urllib3-1.26.3/test/test_retry.py
@@ -1,6 +1,9 @@
 import warnings
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from urllib3.exceptions import (
Index: urllib3-1.26.3/test/test_retry_deprecated.py
===================================================================
--- urllib3-1.26.3.orig/test/test_retry_deprecated.py
+++ urllib3-1.26.3/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
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from urllib3.exceptions import (
Index: urllib3-1.26.3/test/test_ssl.py
===================================================================
--- urllib3-1.26.3.orig/test/test_ssl.py
+++ urllib3-1.26.3/test/test_ssl.py
@@ -1,6 +1,9 @@
 from test import notPyPy2
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from urllib3.exceptions import SNIMissingWarning
Index: urllib3-1.26.3/test/test_ssltransport.py
===================================================================
--- urllib3-1.26.3.orig/test/test_ssltransport.py
+++ urllib3-1.26.3/test/test_ssltransport.py
@@ -4,7 +4,10 @@ import socket
 import ssl
 import sys
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from dummyserver.server import DEFAULT_CA, DEFAULT_CERTS
Index: urllib3-1.26.3/test/test_util.py
===================================================================
--- urllib3-1.26.3.orig/test/test_util.py
+++ urllib3-1.26.3/test/test_util.py
@@ -9,7 +9,10 @@ from itertools import chain
 from test import notBrotlipy, onlyBrotlipy, onlyPy2, onlyPy3
 
 import pytest
-from mock import Mock, patch
+try:
+    from unittest.mock import Mock, patch
+except ImportError:
+    from mock import Mock, patch
 
 from urllib3 import add_stderr_logger, disable_warnings, util
 from urllib3.exceptions import (
Index: urllib3-1.26.3/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
 from test import LONG_TIMEOUT, SHORT_TIMEOUT, onlyPy2
 from threading import Event
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 import six
 
Index: urllib3-1.26.3/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 (
     resolvesLocalhostFQDN,
 )
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 import trustme
 
Index: urllib3-1.26.3/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 (
 )
 from threading import Event
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 import trustme