Merge pull request #5615 from bluetech/type-annotations-2

Improve mypy setup + a few minor type fixes and removals

Author: asottile

.pre-commit-config.yaml

@@ -44,15 +44,10 @@ repos:
     hooks:
     -   id: rst-backticks
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.711
+    rev: v0.720
     hooks:
     -   id: mypy
-        name: mypy (src)
-        files: ^src/
-        args: []
-    -   id: mypy
-        name: mypy (testing)
-        files: ^testing/
+        files: ^(src/|testing/)
         args: []
 -   repo: local
     hooks:

changelog/5615.removal.rst

@@ -0,0 +1,7 @@
+``pytest.fail``, ``pytest.xfail`` and ``pytest.skip`` no longer support bytes for the message argument.
+
+This was supported for Python 2 where it was tempting to use ``"message"``
+instead of ``u"message"``.
+
+Python 3 code is unlikely to pass ``bytes`` to these functions. If you do,
+please decode it to an ``str`` beforehand.

src/_pytest/_code/code.py

@@ -520,7 +520,9 @@ def exconly(self, tryshort: bool = False) -> str:
                 text = text[len(self._striptext) :]
         return text
 
-    def errisinstance(self, exc: "Type[BaseException]") -> bool:
+    def errisinstance(
+        self, exc: Union["Type[BaseException]", Tuple["Type[BaseException]", ...]]
+    ) -> bool:
         """ return True if the exception is an instance of exc """
         return isinstance(self.value, exc)
 

src/_pytest/outcomes.py

@@ -24,10 +24,7 @@ def __init__(self, msg: Optional[str] = None, pytrace: bool = True) -> None:
 
     def __repr__(self) -> str:
         if self.msg:
-            val = self.msg
-            if isinstance(val, bytes):
-                val = val.decode("UTF-8", errors="replace")
-            return val
+            return self.msg
         return "<{} instance>".format(self.__class__.__name__)
 
     __str__ = __repr__

src/_pytest/python.py

@@ -1164,7 +1164,7 @@ def _idval(val, argname, idx, idfn, item, config):
         return str(val)
     elif isinstance(val, REGEX_TYPE):
         return ascii_escaped(val.pattern)
-    elif enum is not None and isinstance(val, enum.Enum):
+    elif isinstance(val, enum.Enum):
         return str(val)
     elif (inspect.isclass(val) or inspect.isfunction(val)) and hasattr(val, "__name__"):
         return val.__name__

src/_pytest/runner.py

@@ -278,10 +278,7 @@ def __init__(self):
         self._finalizers = {}
 
     def addfinalizer(self, finalizer, colitem):
-        """ attach a finalizer to the given colitem.
-        if colitem is None, this will add a finalizer that
-        is called at the end of teardown_all().
-        """
+        """ attach a finalizer to the given colitem. """
         assert colitem and not isinstance(colitem, tuple)
         assert callable(finalizer)
         # assert colitem in self.stack  # some unit tests don't setup stack :/
@@ -309,12 +306,9 @@ def _callfinalizers(self, colitem):
 
     def _teardown_with_finalization(self, colitem):
         self._callfinalizers(colitem)
-        if hasattr(colitem, "teardown"):
-            colitem.teardown()
+        colitem.teardown()
         for colitem in self._finalizers:
-            assert (
-                colitem is None or colitem in self.stack or isinstance(colitem, tuple)
-            )
+            assert colitem in self.stack
 
     def teardown_all(self):
         while self.stack: