Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pytest_mock/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def get_mock_module(config):
config.getini("mock_use_standalone_module")
)
if use_standalone_module:
from unittest import mock
import mock

_mock_module = mock
else:
Expand Down
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ envlist = py{39,310,311,312,313,314}, norewrite, pytest6
[testenv]
deps =
coverage
# Used for standalone mock support.
mock
pytest-asyncio
pytest6: pytest==6.2.5
commands =
Expand Down
Loading