diff -upr python-driver-3.25.0.orig/tests/unit/advanced/cloud/test_cloud.py python-driver-3.25.0/tests/unit/advanced/cloud/test_cloud.py --- python-driver-3.25.0.orig/tests/unit/advanced/cloud/test_cloud.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/advanced/cloud/test_cloud.py 2022-05-17 12:54:41.654450817 +0200 @@ -19,7 +19,7 @@ except ImportError: from cassandra import DriverException from cassandra.datastax import cloud -from mock import patch +from unittest.mock import patch from tests import notwindows diff -upr python-driver-3.25.0.orig/tests/unit/advanced/test_insights.py python-driver-3.25.0/tests/unit/advanced/test_insights.py --- python-driver-3.25.0.orig/tests/unit/advanced/test_insights.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/advanced/test_insights.py 2022-05-17 12:54:41.658450843 +0200 @@ -19,7 +19,7 @@ except ImportError: import unittest # noqa import logging -from mock import sentinel +from unittest.mock import sentinel import sys from cassandra import ConsistencyLevel diff -upr python-driver-3.25.0.orig/tests/unit/advanced/test_policies.py python-driver-3.25.0/tests/unit/advanced/test_policies.py --- python-driver-3.25.0.orig/tests/unit/advanced/test_policies.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/advanced/test_policies.py 2022-05-17 12:54:41.658450843 +0200 @@ -16,7 +16,7 @@ try: except ImportError: import unittest # noqa -from mock import Mock +from unittest.mock import Mock from cassandra.pool import Host from cassandra.policies import RoundRobinPolicy diff -upr python-driver-3.25.0.orig/tests/unit/cqlengine/test_connection.py python-driver-3.25.0/tests/unit/cqlengine/test_connection.py --- python-driver-3.25.0.orig/tests/unit/cqlengine/test_connection.py 2022-05-17 12:54:41.626450646 +0200 +++ python-driver-3.25.0/tests/unit/cqlengine/test_connection.py 2022-05-17 12:54:41.658450843 +0200 @@ -21,7 +21,7 @@ from cassandra.cluster import _ConfigMod from cassandra.cqlengine import connection from cassandra.query import dict_factory -from mock import Mock +from unittest.mock import Mock class ConnectionTest(unittest.TestCase): diff -upr python-driver-3.25.0.orig/tests/unit/io/test_asyncioreactor.py python-driver-3.25.0/tests/unit/io/test_asyncioreactor.py --- python-driver-3.25.0.orig/tests/unit/io/test_asyncioreactor.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/io/test_asyncioreactor.py 2022-05-17 12:54:41.658450843 +0200 @@ -10,7 +10,7 @@ except (ImportError, SyntaxError): from tests import is_monkey_patched, connection_class from tests.unit.io.utils import TimerCallback, TimerTestMixin -from mock import patch +from unittest.mock import patch import unittest import time diff -upr python-driver-3.25.0.orig/tests/unit/io/test_asyncorereactor.py python-driver-3.25.0/tests/unit/io/test_asyncorereactor.py --- python-driver-3.25.0.orig/tests/unit/io/test_asyncorereactor.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/io/test_asyncorereactor.py 2022-05-17 12:54:41.658450843 +0200 @@ -16,7 +16,7 @@ try: except ImportError: import unittest # noqa -from mock import patch +from unittest.mock import patch import socket import cassandra.io.asyncorereactor as asyncorereactor from cassandra.io.asyncorereactor import AsyncoreConnection diff -upr python-driver-3.25.0.orig/tests/unit/io/test_eventletreactor.py python-driver-3.25.0/tests/unit/io/test_eventletreactor.py --- python-driver-3.25.0.orig/tests/unit/io/test_eventletreactor.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/io/test_eventletreactor.py 2022-05-17 12:54:41.658450843 +0200 @@ -22,7 +22,7 @@ from tests.unit.io.utils import TimerTes from tests import notpypy, EVENT_LOOP_MANAGER from eventlet import monkey_patch -from mock import patch +from unittest.mock import patch try: from cassandra.io.eventletreactor import EventletConnection diff -upr python-driver-3.25.0.orig/tests/unit/io/test_geventreactor.py python-driver-3.25.0/tests/unit/io/test_geventreactor.py --- python-driver-3.25.0.orig/tests/unit/io/test_geventreactor.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/io/test_geventreactor.py 2022-05-17 12:54:41.658450843 +0200 @@ -26,7 +26,7 @@ try: except ImportError: GeventConnection = None # noqa -from mock import patch +from unittest.mock import patch skip_condition = GeventConnection is None or EVENT_LOOP_MANAGER != "gevent" diff -upr python-driver-3.25.0.orig/tests/unit/io/test_libevreactor.py python-driver-3.25.0/tests/unit/io/test_libevreactor.py --- python-driver-3.25.0.orig/tests/unit/io/test_libevreactor.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/io/test_libevreactor.py 2022-05-17 12:54:41.658450843 +0200 @@ -16,7 +16,7 @@ try: except ImportError: import unittest # noqa -from mock import patch, Mock +from unittest.mock import patch, Mock import weakref import socket diff -upr python-driver-3.25.0.orig/tests/unit/io/test_twistedreactor.py python-driver-3.25.0/tests/unit/io/test_twistedreactor.py --- python-driver-3.25.0.orig/tests/unit/io/test_twistedreactor.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/io/test_twistedreactor.py 2022-05-17 12:54:41.658450843 +0200 @@ -16,7 +16,7 @@ try: import unittest2 as unittest except ImportError: import unittest -from mock import Mock, patch +from unittest.mock import Mock, patch from cassandra.connection import DefaultEndPoint diff -upr python-driver-3.25.0.orig/tests/unit/io/utils.py python-driver-3.25.0/tests/unit/io/utils.py --- python-driver-3.25.0.orig/tests/unit/io/utils.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/io/utils.py 2022-05-17 12:54:41.658450843 +0200 @@ -28,7 +28,7 @@ from functools import wraps from itertools import cycle import six from six import binary_type, BytesIO -from mock import Mock +from unittest.mock import Mock import errno import logging diff -upr python-driver-3.25.0.orig/tests/unit/test_cluster.py python-driver-3.25.0/tests/unit/test_cluster.py --- python-driver-3.25.0.orig/tests/unit/test_cluster.py 2022-05-17 12:54:41.626450646 +0200 +++ python-driver-3.25.0/tests/unit/test_cluster.py 2022-05-17 12:54:41.658450843 +0200 @@ -19,7 +19,7 @@ except ImportError: import logging import six -from mock import patch, Mock +from unittest.mock import patch, Mock from cassandra import ConsistencyLevel, DriverException, Timeout, Unavailable, RequestExecutionException, ReadTimeout, WriteTimeout, CoordinationFailure, ReadFailure, WriteFailure, FunctionFailure, AlreadyExists,\ InvalidRequest, Unauthorized, AuthenticationFailed, OperationTimedOut, UnsupportedOperation, RequestValidationException, ConfigurationException, ProtocolVersion diff -upr python-driver-3.25.0.orig/tests/unit/test_concurrent.py python-driver-3.25.0/tests/unit/test_concurrent.py --- python-driver-3.25.0.orig/tests/unit/test_concurrent.py 2022-05-17 12:54:41.626450646 +0200 +++ python-driver-3.25.0/tests/unit/test_concurrent.py 2022-05-17 12:54:41.658450843 +0200 @@ -19,7 +19,7 @@ except ImportError: import unittest # noqa from itertools import cycle -from mock import Mock +from unittest.mock import Mock import time import threading from six.moves.queue import PriorityQueue diff -upr python-driver-3.25.0.orig/tests/unit/test_connection.py python-driver-3.25.0/tests/unit/test_connection.py --- python-driver-3.25.0.orig/tests/unit/test_connection.py 2022-05-17 12:54:41.626450646 +0200 +++ python-driver-3.25.0/tests/unit/test_connection.py 2022-05-17 12:54:41.658450843 +0200 @@ -16,7 +16,7 @@ try: except ImportError: import unittest # noqa -from mock import Mock, ANY, call, patch +from unittest.mock import Mock, ANY, call, patch import six from six import BytesIO import time diff -upr python-driver-3.25.0.orig/tests/unit/test_control_connection.py python-driver-3.25.0/tests/unit/test_control_connection.py --- python-driver-3.25.0.orig/tests/unit/test_control_connection.py 2022-05-17 12:54:41.626450646 +0200 +++ python-driver-3.25.0/tests/unit/test_control_connection.py 2022-05-17 12:54:41.658450843 +0200 @@ -20,7 +20,7 @@ except ImportError: import six from concurrent.futures import ThreadPoolExecutor -from mock import Mock, ANY, call +from unittest.mock import Mock, ANY, call from cassandra import OperationTimedOut, SchemaTargetType, SchemaChangeType from cassandra.protocol import ResultMessage, RESULT_KIND_ROWS diff -upr python-driver-3.25.0.orig/tests/unit/test_endpoints.py python-driver-3.25.0/tests/unit/test_endpoints.py --- python-driver-3.25.0.orig/tests/unit/test_endpoints.py 2022-05-17 12:54:41.626450646 +0200 +++ python-driver-3.25.0/tests/unit/test_endpoints.py 2022-05-17 12:54:41.658450843 +0200 @@ -15,7 +15,7 @@ import itertools from cassandra.connection import DefaultEndPoint, SniEndPoint, SniEndPointFactory -from mock import patch +from unittest.mock import patch def socket_getaddrinfo(*args): diff -upr python-driver-3.25.0.orig/tests/unit/test_metadata.py python-driver-3.25.0/tests/unit/test_metadata.py --- python-driver-3.25.0.orig/tests/unit/test_metadata.py 2022-05-17 12:54:41.626450646 +0200 +++ python-driver-3.25.0/tests/unit/test_metadata.py 2022-05-17 12:54:41.658450843 +0200 @@ -18,7 +18,7 @@ except ImportError: from binascii import unhexlify import logging -from mock import Mock +from unittest.mock import Mock import os import six import timeit diff -upr python-driver-3.25.0.orig/tests/unit/test_policies.py python-driver-3.25.0/tests/unit/test_policies.py --- python-driver-3.25.0.orig/tests/unit/test_policies.py 2022-05-17 12:54:41.626450646 +0200 +++ python-driver-3.25.0/tests/unit/test_policies.py 2022-05-17 12:54:41.662450867 +0200 @@ -18,7 +18,7 @@ except ImportError: import unittest # noqa from itertools import islice, cycle -from mock import Mock, patch, call +from unittest.mock import Mock, patch, call from random import randint import six from six.moves._thread import LockType diff -upr python-driver-3.25.0.orig/tests/unit/test_protocol.py python-driver-3.25.0/tests/unit/test_protocol.py --- python-driver-3.25.0.orig/tests/unit/test_protocol.py 2022-05-17 12:54:41.626450646 +0200 +++ python-driver-3.25.0/tests/unit/test_protocol.py 2022-05-17 12:54:41.662450867 +0200 @@ -17,7 +17,7 @@ try: except ImportError: import unittest # noqa -from mock import Mock +from unittest.mock import Mock from cassandra import ProtocolVersion, UnsupportedOperation from cassandra.protocol import ( diff -upr python-driver-3.25.0.orig/tests/unit/test_response_future.py python-driver-3.25.0/tests/unit/test_response_future.py --- python-driver-3.25.0.orig/tests/unit/test_response_future.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/test_response_future.py 2022-05-17 12:54:41.662450867 +0200 @@ -17,7 +17,7 @@ try: except ImportError: import unittest # noqa -from mock import Mock, MagicMock, ANY +from unittest.mock import Mock, MagicMock, ANY from cassandra import ConsistencyLevel, Unavailable, SchemaTargetType, SchemaChangeType, OperationTimedOut from cassandra.cluster import Session, ResponseFuture, NoHostAvailable, ProtocolVersion diff -upr python-driver-3.25.0.orig/tests/unit/test_resultset.py python-driver-3.25.0/tests/unit/test_resultset.py --- python-driver-3.25.0.orig/tests/unit/test_resultset.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/test_resultset.py 2022-05-17 12:54:41.662450867 +0200 @@ -18,7 +18,7 @@ try: except ImportError: import unittest # noqa -from mock import Mock, PropertyMock, patch +from unittest.mock import Mock, PropertyMock, patch from cassandra.cluster import ResultSet diff -upr python-driver-3.25.0.orig/tests/unit/test_timestamps.py python-driver-3.25.0/tests/unit/test_timestamps.py --- python-driver-3.25.0.orig/tests/unit/test_timestamps.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/test_timestamps.py 2022-05-17 12:54:41.662450867 +0200 @@ -17,7 +17,7 @@ try: except ImportError: import unittest # noqa -import mock +from unittest import mock from cassandra import timestamps from threading import Thread, Lock diff -upr python-driver-3.25.0.orig/tests/unit/utils.py python-driver-3.25.0/tests/unit/utils.py --- python-driver-3.25.0.orig/tests/unit/utils.py 2022-05-17 12:54:41.630450670 +0200 +++ python-driver-3.25.0/tests/unit/utils.py 2022-05-17 12:54:41.662450867 +0200 @@ -15,7 +15,7 @@ from concurrent.futures import Future from functools import wraps from cassandra.cluster import Session -from mock import patch +from unittest.mock import patch def mock_session_pools(f):