Merge branch 'blyxxyz-union-tests'

qutebrowser/utils/typing.py

@@ -38,10 +38,6 @@ class FakeTypingMeta(type):
                  **_kwds):
         pass
 
-    def __subclasscheck__(self, cls):
-        """We implement this for qutebrowser.commands.command to work."""
-        return isinstance(cls, FakeTypingMeta)
-
 
 class FakeUnionMeta(FakeTypingMeta):
 

tests/unit/utils/test_typing.py

@@ -32,13 +32,23 @@ def pytyping():
 class TestUnion:
 
     def test_python_subclass(self, pytyping):
-        assert issubclass(pytyping.Union[str, int], pytyping.Union)
+        assert (type(pytyping.Union[str, int]) is  # flake8: disable=E721
+                type(pytyping.Union))
 
     def test_qute_subclass(self):
-        assert issubclass(typing.FakeUnion[str, int], typing.FakeUnion)
+        assert (type(typing.FakeUnion[str, int]) is  # flake8: disable=E721
+                type(typing.FakeUnion))
 
     def test_python_params(self, pytyping):
-        assert pytyping.Union[str, int].__union_params__ == (str, int)
+        union = pytyping.Union[str, int]
+        try:
+            assert union.__union_params__ == (str, int)
+        except AttributeError:
+            assert union.__args__ == (str, int)
 
     def test_qute_params(self):
-        assert typing.FakeUnion[str, int].__union_params__ == (str, int)
+        union = typing.FakeUnion[str, int]
+        try:
+            assert union.__union_params__ == (str, int)
+        except AttributeError:
+            assert union.__args__ == (str, int)