Fix mypy errors (#194)

Co-authored-by: Thiago C. D'Ávila <[email protected]>
Co-authored-by: Bruno Oliveira <[email protected]>

Author: 3 people

.gitignore

@@ -58,4 +58,5 @@ docs/_build/
 
 # IDE
 .idea
+.vscode
 /src/pytest_mock/_version.py

.pre-commit-config.yaml

@@ -18,3 +18,10 @@ repos:
         files: ^(CHANGELOG.rst|README.rst|HOWTORELEASE.rst|changelog/.*)$
         language: python
         additional_dependencies: [pygments, restructuredtext_lint]
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.780  # NOTE: keep this in sync with tox.ini
+    hooks:
+      - id: mypy
+        files: ^src
+        args: []
+        additional_dependencies: [pytest>=6]

setup.cfg

@@ -0,0 +1,2 @@
+[mypy]
+pretty = True

src/pytest_mock/plugin.py

@@ -1,13 +1,12 @@
+from typing import Any
+from typing import Dict
+
 import asyncio
 import functools
 import inspect
 
 import pytest
 
-from ._version import version
-
-__version__ = version
-
 
 def _get_mock_module(config):
     """
@@ -209,7 +208,7 @@ def _mocker(pytestconfig):
 
 
 _mock_module_patches = []
-_mock_module_originals = {}
+_mock_module_originals = {}  # type: Dict[str, Any]
 
 
 def assert_wrapper(__wrapped_mock_method__, *args, **kwargs):
@@ -228,18 +227,17 @@ def assert_wrapper(__wrapped_mock_method__, *args, **kwargs):
                 introspection = ""
                 try:
                     assert actual_args == args[1:]
-                except AssertionError as e:
-                    introspection += "\nArgs:\n" + str(e)
+                except AssertionError as e_args:
+                    introspection += "\nArgs:\n" + str(e_args)
                 try:
                     assert actual_kwargs == kwargs
-                except AssertionError as e:
-                    introspection += "\nKwargs:\n" + str(e)
-
+                except AssertionError as e_kwargs:
+                    introspection += "\nKwargs:\n" + str(e_kwargs)
                 if introspection:
                     msg += "\n\npytest introspection follows:\n" + introspection
-    e = AssertionError(msg)
-    e._mock_introspection_applied = True
-    raise e
+        e = AssertionError(msg)
+        e._mock_introspection_applied = True
+        raise e
 
 
 def wrap_assert_not_called(*args, **kwargs):

tox.ini

@@ -1,4 +1,5 @@
 [tox]
+minversion = 3.5.3
 envlist = py{35,36,37,38}, linting, norewrite
 
 [testenv]
@@ -20,6 +21,11 @@ extras = dev
 basepython = python3.6
 commands = pre-commit run --all-files --show-diff-on-failure
 
+[testenv:mypy]
+deps =
+    mypy==0.780
+commands = mypy {posargs:src}
+
 [pytest]
 addopts = -r a