Merge pull request #205 from nicoddemus/release-3.3.1

Introduce MockFixture as alias to MockerFixture
pytest-dev · Aug 26, 2020 · 7c307ea · 7c307ea
2 parents 4bfd8ad + 225da22
commit 7c307ea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,15 @@
+3.3.1 (2020-08-24)
+------------------
+
+* Introduce ``MockFixture`` as an alias to ``MockerFixture``.
+
+  Before ``3.3.0``, the fixture class was named ``MockFixture``, but was renamed to ``MockerFixture`` to better
+  match the ``mocker`` fixture. While not officially part of the API, it was later discovered that this broke
+  the code of some users which already imported ``pytest_mock.MockFixture`` for type annotations, so we
+  decided to reintroduce the name as an alias.
+
+  Note however that this is just a stop gap measure, and new code should use ``MockerFixture`` for type annotations.
+
 3.3.0 (2020-08-21)
 ------------------
 

diff --git a/src/pytest_mock/__init__.py b/src/pytest_mock/__init__.py
@@ -1,7 +1,10 @@
 from pytest_mock.plugin import *
 
+MockFixture = MockerFixture  # backward-compatibility only (#204)
+
 __all__ = [
     "MockerFixture",
+    "MockFixture",
     "pytest_addoption",
     "pytest_configure",
     "session_mocker",