Enable aliases in pytest_mock (#4359)

* Require newer pytype

Author: srittau

requirements-tests-py3.txt

@@ -5,4 +5,4 @@ flake8==3.8.3
 flake8-bugbear==20.1.4
 flake8-pyi==20.5.0
 isort[pyproject]==5.1.1
-pytype>=2020.07.20
+pytype>=2020.07.24

third_party/3/pytest_mock/plugin.pyi

@@ -14,17 +14,16 @@ def _get_mock_module(config: _Config) -> _MockModule: ...
 class MockFixture:
     mock_module: _MockModule
     patch: MockFixture._Patcher  # google/pytype#611
-    # The following aliases don't work due to google/pytype#612
-    Mock: Any  # actually unittest.mock.Mock
-    MagicMock: Any  # actually unittest.mock.MagicMock
-    NonCallableMock: Any  # actually unittest.mock.NonCallableMock
-    PropertyMock: Any  # actually unittest.mock.PropertyMock
-    call: Any  # actually unittest.mock.call
-    ANY: Any  # actually unittest.mock.ANY
-    DEFAULT: Any  # actually unittest.mock.DEFAULT
-    create_autospec: Any  # actually unittest.mock.create_autospec
-    sentinel: Any  # actually unittest.mock.sentinel
-    mock_open: Any  # actually unittest.mock.mock_open
+    Mock = unittest.mock.Mock
+    MagicMock = unittest.mock.MagicMock
+    NonCallableMock = unittest.mock.NonCallableMock
+    PropertyMock = unittest.mock.PropertyMock
+    call = unittest.mock.call
+    ANY = unittest.mock.ANY
+    DEFAULT = unittest.mock.DEFAULT
+    create_autospec = unittest.mock.create_autospec
+    sentinel = unittest.mock.sentinel
+    mock_open = unittest.mock.mock_open
     def __init__(self, config: _Config) -> None: ...
     def resetall(self) -> None: ...
     def stopall(self) -> None: ...