Skip to content

Commit

Permalink
Merge pull request #235 from plannigan/patch_dict_annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus committed Apr 24, 2021
2 parents be33132 + 6e5600d commit 28ef007
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions CHANGELOG.rst
@@ -1,3 +1,12 @@
3.5.2 (UNRELEASED)
------------------

* Correct type annotations for ``mocker.patch.object`` to also include the string form.
Thanks `@plannigan`_ for the PR (`#235`_).

.. _@plannigan: https://github.com/plannigan
.. _#235: https://github.com/pytest-dev/pytest-mock/pull/235

3.5.1 (2021-01-10)
------------------

Expand Down
2 changes: 1 addition & 1 deletion src/pytest_mock/plugin.py
Expand Up @@ -267,7 +267,7 @@ def multiple(

def dict(
self,
in_dict: Mapping[Any, Any],
in_dict: Union[Mapping[Any, Any], str],
values: Union[Mapping[Any, Any], Iterable[Tuple[Any, Any]]] = (),
clear: bool = False,
**kwargs: Any
Expand Down

0 comments on commit 28ef007

Please sign in to comment.