Skip to content

Commit 021654f

Browse files
authored
chore: restore types in tests/test_util.py (#679)
1 parent 59f1244 commit 021654f

File tree

2 files changed

+39
-38
lines changed

2 files changed

+39
-38
lines changed

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ ignore = [
166166

167167
[tool.ruff.lint.per-file-ignores]
168168
"tests/*.py" = ["D", "S", "E501"]
169+
"tests/test_util.py" = ["D", "S", "E501", "UP006"]
169170
"docs/*.py" = ["B"]
170171
"docs/examples/*.py" = ["D", "B", "E501"]
171172
"src/magicgui/widgets/_image/*.py" = ["D"]

tests/test_util.py

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,72 +11,72 @@ def test_basic(self):
1111
assert safe_issubclass(int, object)
1212

1313
def test_generic_base(self):
14-
assert safe_issubclass(list[int], list)
15-
assert safe_issubclass(list[int], list)
14+
assert safe_issubclass(typing.List[int], list)
15+
assert safe_issubclass(typing.List[int], typing.List)
1616

1717
def test_multiple_generic_base(self):
18-
assert safe_issubclass(list[int], (list, dict))
18+
assert safe_issubclass(typing.List[int], (typing.List, typing.Dict))
1919

2020
def test_no_exception(self):
2121
assert not safe_issubclass(int, 1)
2222

2323
def test_typing_inheritance(self):
24-
assert safe_issubclass(list, list)
25-
assert safe_issubclass(list, list)
26-
assert safe_issubclass(tuple, tuple)
27-
assert safe_issubclass(tuple, tuple)
28-
assert safe_issubclass(dict, dict)
29-
assert safe_issubclass(dict, dict)
24+
assert safe_issubclass(typing.List, list)
25+
assert safe_issubclass(list, typing.List)
26+
assert safe_issubclass(typing.Tuple, tuple)
27+
assert safe_issubclass(tuple, typing.Tuple)
28+
assert safe_issubclass(typing.Dict, dict)
29+
assert safe_issubclass(dict, typing.Dict)
3030

3131
def test_inheritance_generic_list(self):
3232
assert safe_issubclass(list, typing.Sequence)
33-
assert safe_issubclass(list, typing.Sequence)
34-
assert safe_issubclass(list[int], typing.Sequence[int])
35-
assert safe_issubclass(list[int], typing.Sequence)
36-
assert safe_issubclass(list[int], Sequence)
33+
assert safe_issubclass(typing.List, typing.Sequence)
34+
assert safe_issubclass(typing.List[int], typing.Sequence[int])
35+
assert safe_issubclass(typing.List[int], typing.Sequence)
36+
assert safe_issubclass(typing.List[int], Sequence)
3737

3838
def test_no_inheritance_generic_super(self):
39-
assert not safe_issubclass(list, list[int])
39+
assert not safe_issubclass(list, typing.List[int])
4040

4141
def test_inheritance_generic_mapping(self):
4242
assert safe_issubclass(dict, typing.Mapping)
43-
assert safe_issubclass(dict, typing.Mapping)
44-
assert safe_issubclass(dict[int, str], typing.Mapping[int, str])
45-
assert safe_issubclass(dict[int, str], typing.Mapping)
46-
assert safe_issubclass(dict[int, str], Mapping)
43+
assert safe_issubclass(typing.Dict, typing.Mapping)
44+
assert safe_issubclass(typing.Dict[int, str], typing.Mapping[int, str])
45+
assert safe_issubclass(typing.Dict[int, str], typing.Mapping)
46+
assert safe_issubclass(typing.Dict[int, str], Mapping)
4747

4848
def test_typing_builtins_list(self):
4949
assert safe_issubclass(list[int], list)
5050
assert safe_issubclass(list[int], Sequence)
5151
assert safe_issubclass(list[int], typing.Sequence)
5252
assert safe_issubclass(list[int], typing.Sequence[int])
53-
assert safe_issubclass(list[int], list[int])
54-
assert safe_issubclass(list[int], list)
55-
assert safe_issubclass(list[int], list[int])
53+
assert safe_issubclass(list[int], typing.List[int])
54+
assert safe_issubclass(typing.List[int], list)
55+
assert safe_issubclass(typing.List[int], list[int])
5656

5757
def test_typing_builtins_dict(self):
5858
assert safe_issubclass(dict[int, str], dict)
5959
assert safe_issubclass(dict[int, str], Mapping)
6060
assert safe_issubclass(dict[int, str], typing.Mapping)
6161
assert safe_issubclass(dict[int, str], typing.Mapping[int, str])
62-
assert safe_issubclass(dict[int, str], dict[int, str])
63-
assert safe_issubclass(dict[int, str], dict)
64-
assert safe_issubclass(dict[int, str], dict[int, str])
62+
assert safe_issubclass(dict[int, str], typing.Dict[int, str])
63+
assert safe_issubclass(typing.Dict[int, str], dict)
64+
assert safe_issubclass(typing.Dict[int, str], dict[int, str])
6565

6666
def test_tuple_check(self):
67-
assert safe_issubclass(tuple[int, str], tuple)
68-
assert safe_issubclass(tuple[int], typing.Sequence[int])
69-
assert safe_issubclass(tuple[int, int], typing.Sequence[int])
70-
assert safe_issubclass(tuple[int, ...], typing.Sequence[int])
71-
assert safe_issubclass(tuple[int, ...], typing.Iterable[int])
72-
assert not safe_issubclass(tuple[int, ...], dict[int, typing.Any])
73-
assert safe_issubclass(tuple[int, ...], tuple[int, ...])
74-
assert safe_issubclass(tuple[int, int], tuple[int, ...])
75-
assert not safe_issubclass(tuple[int, int], tuple[int, str])
76-
assert not safe_issubclass(tuple[int, int], tuple[int, int, int])
67+
assert safe_issubclass(typing.Tuple[int, str], tuple)
68+
assert safe_issubclass(typing.Tuple[int], typing.Sequence[int])
69+
assert safe_issubclass(typing.Tuple[int, int], typing.Sequence[int])
70+
assert safe_issubclass(typing.Tuple[int, ...], typing.Sequence[int])
71+
assert safe_issubclass(typing.Tuple[int, ...], typing.Iterable[int])
72+
assert not safe_issubclass(typing.Tuple[int, ...], typing.Dict[int, typing.Any])
73+
assert safe_issubclass(typing.Tuple[int, ...], typing.Tuple[int, ...])
74+
assert safe_issubclass(typing.Tuple[int, int], typing.Tuple[int, ...])
75+
assert not safe_issubclass(typing.Tuple[int, int], typing.Tuple[int, str])
76+
assert not safe_issubclass(typing.Tuple[int, int], typing.Tuple[int, int, int])
7777

7878
def test_subclass_future(self):
79-
assert safe_issubclass(Future[list[int]], Future[list[int]])
80-
assert safe_issubclass(Future[list[int]], Future[list])
81-
assert safe_issubclass(Future[list[int]], Future[list[int]])
82-
assert not safe_issubclass(Future[list[int]], Future[list[str]])
79+
assert safe_issubclass(Future[typing.List[int]], Future[list[int]])
80+
assert safe_issubclass(Future[typing.List[int]], Future[list])
81+
assert safe_issubclass(Future[list[int]], Future[typing.List[int]])
82+
assert not safe_issubclass(Future[list[int]], Future[typing.List[str]])

0 commit comments

Comments
 (0)