Switch to stdlib's mock instead of a backported one

Signed-off-by: Sergey Vasilyev <[email protected]>

pytest.ini

@@ -1,6 +1,4 @@
 [pytest]
-; The standalone `mock` instead of stdlib `unittest.mock` is only for AsyncMock in Python 3.7.
-mock_use_standalone_module = true
 asyncio_mode = auto
 addopts =
     --strict-markers

requirements.txt

@@ -12,9 +12,6 @@ freezegun
 import-linter
 isort
 lxml
-# Generally, `unittest.mock` is enough, but it lacks `AsyncMock` for Py 3.7.
-# TODO: Once 3.7 is removed (Jun 2023), roll back to unittest.mock.
-mock
 # Mypy requires typed-ast, which is broken on PyPy 3.7 (could work in PyPy 3.8).
 mypy==1.2.0; implementation_name == "cpython"
 pre-commit

tests/admission/test_admission_server.py

@@ -1,7 +1,7 @@
 import contextlib
+from unittest.mock import Mock
 
 import pytest
-from mock import Mock
 
 import kopf
 from kopf._cogs.aiokits.aiovalues import Container

tests/admission/test_serving_handler_selection.py

@@ -1,5 +1,6 @@
+from unittest.mock import Mock
+
 import pytest
-from mock import Mock
 
 import kopf
 from kopf._cogs.structs.ids import HandlerId

tests/admission/test_serving_kwargs_passthrough.py

@@ -1,5 +1,6 @@
+from unittest.mock import Mock
+
 import pytest
-from mock import Mock
 
 import kopf
 from kopf._core.engines.admission import serve_admission_request

tests/apis/test_iterjsonlines.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 
 from kopf._cogs.clients.api import iter_jsonlines
 

tests/basic-structs/test_memories.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 
 from kopf._cogs.structs.bodies import Body
 from kopf._cogs.structs.ephemera import Memo

tests/causation/test_kwargs.py

@@ -1,9 +1,9 @@
 import dataclasses
 import logging
 from typing import Type
+from unittest.mock import Mock
 
 import pytest
-from mock import Mock
 
 from kopf._cogs.configs.configuration import OperatorSettings
 from kopf._cogs.structs import diffs

tests/conftest.py

@@ -8,10 +8,10 @@
 import sys
 import time
 from typing import Set
+from unittest.mock import AsyncMock, Mock
 
 import aiohttp.web
 import pytest
-from mock import AsyncMock, Mock
 
 import kopf
 from kopf._cogs.clients.auth import APIContext

tests/handling/conftest.py

@@ -35,9 +35,9 @@
 """
 import dataclasses
 from typing import Callable
+from unittest.mock import Mock
 
 import pytest
-from mock import Mock
 
 import kopf
 from kopf._core.intents.causes import ChangingCause

tests/handling/daemons/conftest.py

@@ -1,10 +1,10 @@
 import asyncio
 import contextlib
 import time
+from unittest.mock import MagicMock, patch
 
 import freezegun
 import pytest
-from mock import MagicMock, patch
 
 import kopf
 from kopf._cogs.aiokits.aiotoggles import ToggleSet

tests/handling/subhandling/test_subhandling.py

@@ -1,8 +1,8 @@
 import asyncio
 import logging
+from unittest.mock import Mock
 
 import pytest
-from mock import Mock
 
 import kopf
 from kopf._cogs.structs.ephemera import Memo

tests/handling/test_parametrization.py

@@ -1,6 +1,5 @@
 import asyncio
-
-from mock import Mock
+from unittest.mock import Mock
 
 import kopf
 from kopf._cogs.structs.ephemera import Memo

tests/hierarchies/conftest.py

@@ -1,5 +1,6 @@
+from unittest.mock import Mock
+
 import pytest
-from mock import Mock
 
 
 class CustomIterable:

tests/hierarchies/test_owner_referencing.py

@@ -1,7 +1,7 @@
 import copy
+from unittest.mock import call
 
 import pytest
-from mock import call
 
 import kopf
 from kopf._cogs.structs.bodies import Body, RawBody, RawMeta

tests/invocations/test_callbacks.py

@@ -1,9 +1,9 @@
 import functools
 import logging
 import traceback
+from unittest.mock import Mock
 
 import pytest
-from mock import Mock
 
 from kopf._cogs.structs.bodies import Body
 from kopf._cogs.structs.patches import Patch

tests/persistence/test_states.py

@@ -1,8 +1,8 @@
 import datetime
+from unittest.mock import Mock
 
 import freezegun
 import pytest
-from mock import Mock
 
 from kopf._cogs.configs.progress import SmartProgressStorage, StatusProgressStorage
 from kopf._cogs.structs.bodies import Body

tests/reactor/conftest.py

@@ -1,8 +1,8 @@
 import asyncio
 import functools
+from unittest.mock import AsyncMock
 
 import pytest
-from mock import AsyncMock
 
 from kopf._cogs.clients.watching import infinite_watch
 from kopf._core.reactor.queueing import watcher, worker as original_worker

tests/registries/test_matching_of_callbacks.py

@@ -1,7 +1,7 @@
 import dataclasses
+from unittest.mock import Mock
 
 import pytest
-from mock import Mock
 
 from kopf._cogs.structs.bodies import Body
 from kopf._cogs.structs.dicts import parse_field

tests/registries/test_matching_of_resources.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 
 from kopf._cogs.structs.references import Resource, Selector
 from kopf._core.intents.registries import _matches_resource

tests/settings/test_executor.py

@@ -1,7 +1,6 @@
 import concurrent.futures
 import threading
-
-from mock import MagicMock
+from unittest.mock import MagicMock
 
 import kopf
 from kopf._core.actions.invocation import invoke

tests/timing/test_throttling.py

@@ -1,8 +1,8 @@
 import asyncio
 import logging
+from unittest.mock import call
 
 import pytest
-from mock import call
 
 from kopf._core.actions.throttlers import Throttler, throttled
 

tests/utilities/aiotasks/test_coro_cancellation.py

@@ -1,9 +1,9 @@
 import asyncio
 import gc
 import warnings
+from unittest.mock import AsyncMock, Mock
 
 import pytest
-from mock import AsyncMock, Mock
 
 from kopf._cogs.aiokits.aiotasks import cancel_coro
 

tests/utilities/aiotasks/test_scheduler.py

@@ -1,7 +1,7 @@
 import asyncio
+from unittest.mock import Mock
 
 import pytest
-from mock import Mock
 
 from kopf._cogs.aiokits.aiotasks import Scheduler