Skip to content

Commit

Permalink
Fix regression due to 'mock' import
Browse files Browse the repository at this point in the history
Fix #298
  • Loading branch information
nicoddemus committed Jun 24, 2022
1 parent 6ce9a78 commit 7261433
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Releases
========

3.8.1 (2022-06-24)
------------------

* Fix regression caused by an explicit ``mock`` dependency in the code (`#298`_).

.. _#298: https://github.com/pytest-dev/pytest-mock/issues/298

3.8.0 (2022-06-24)
------------------
Expand Down
3 changes: 1 addition & 2 deletions src/pytest_mock/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
if sys.version_info[:2] > (3, 7):
AsyncMockType = unittest.mock.AsyncMock
else:
import mock
AsyncMockType = mock.AsyncMock
AsyncMockType = Any


class PytestMockWarning(UserWarning):
Expand Down

0 comments on commit 7261433

Please sign in to comment.