Skip to content

Commit 808d619

Browse files
committed
Fix type hints.
1 parent 2325a29 commit 808d619

File tree

5 files changed

+24
-23
lines changed

5 files changed

+24
-23
lines changed

domdf_python_tools/delegators.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ def _f(f: Callable):
8282
del to_params[param]
8383

8484
f.__signature__ = from_sig.replace( # type: ignore
85-
parameters=[*from_params.values(), *to_params.values()]
86-
) # type: ignore
85+
parameters=[*from_params.values(), *to_params.values()]
86+
) # type: ignore
8787
f.__annotations__ = {**to_annotations, **from_annotations}
8888

8989
return f

tests/list_tests.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
# stdlib
1313
import sys
1414
from functools import cmp_to_key
15-
16-
# 3rd party
1715
from typing import List, no_type_check
1816

17+
# 3rd party
1918
import pytest
2019

2120
# this package

tests/seq_tests.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
import pickle
1313
import sys
1414
from itertools import chain
15-
16-
# 3rd party
1715
from typing import List
1816

17+
# 3rd party
1918
import pytest
2019

2120
# this package
@@ -219,19 +218,19 @@ def __getitem__(self, i):
219218
v0 = self.type2test(s)
220219
self.assertEqual(len(v0), len(s))
221220

222-
s = "this is also a sequence"
223-
vv = self.type2test(s)
224-
self.assertEqual(len(vv), len(s))
221+
s2 = "this is also a sequence"
222+
vv = self.type2test(s2)
223+
self.assertEqual(len(vv), len(s2))
225224

226225
# Create from various iteratables
227-
for s in ("123", "", range(1000), ('do', 1.2), range(2000, 2200, 5)):
226+
for s2 in ("123", "", range(1000), ('do', 1.2), range(2000, 2200, 5)): # type: ignore
228227
for g in (Sequence, IterFunc, IterGen, itermulti, iterfunc):
229-
self.assertEqual(self.type2test(g(s)), self.type2test(s))
230-
self.assertEqual(self.type2test(IterFuncStop(s)), self.type2test())
228+
self.assertEqual(self.type2test(g(s2)), self.type2test(s2))
229+
self.assertEqual(self.type2test(IterFuncStop(s2)), self.type2test())
231230
self.assertEqual(self.type2test(c for c in "123"), self.type2test("123"))
232-
self.assertRaises(TypeError, self.type2test, IterNextOnly(s))
233-
self.assertRaises(TypeError, self.type2test, IterNoNext(s))
234-
self.assertRaises(ZeroDivisionError, self.type2test, IterGenExc(s))
231+
self.assertRaises(TypeError, self.type2test, IterNextOnly(s2))
232+
self.assertRaises(TypeError, self.type2test, IterNoNext(s2))
233+
self.assertRaises(ZeroDivisionError, self.type2test, IterGenExc(s2))
235234

236235
# Issue #23757
237236
self.assertEqual(self.type2test(LyingTuple((2, ))), self.type2test((1, )))

tests/test_pretty_print.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
import itertools
1313
import random
1414
import types
15-
16-
# 3rd party
1715
from typing import no_type_check
1816

17+
# 3rd party
1918
import pytest
2019
from pytest_regressions.file_regression import FileRegressionFixture # type: ignore
2120

tests/test_userlist.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@
88

99
# Check every path through every method of UserList
1010

11-
# this package
12-
from typing import Type
11+
# stdlib
12+
from typing import Sequence, Type, no_type_check
1313

14+
# this package
1415
from domdf_python_tools.bases import UserList
1516
from domdf_python_tools.testing import not_pypy
1617
from tests import list_tests
1718

1819

1920
class TestList(list_tests.CommonTest):
20-
type2test = list
21+
type2test: Type[Sequence] = list
2122

2223
def test_getslice(self):
2324
super().test_getslice()
2425
l = [0, 1, 2, 3, 4]
25-
u = self.type2test(l)
26+
u = self.type2test(l) # type: ignore
2627
for i in range(-3, 6):
2728
assert u[:i] == l[:i]
2829
assert u[i:] == l[i:]
@@ -31,28 +32,31 @@ def test_getslice(self):
3132

3233
def test_slice_type(self):
3334
l = [0, 1, 2, 3, 4]
34-
u = self.type2test(l)
35+
u = self.type2test(l) # type: ignore
3536
assert u[:] != u.__class__
3637
assert u[:] == u
3738

3839
@not_pypy("Doesn't work on PyPy")
3940
def test_iadd(self):
4041
super().test_iadd()
4142
u = [0, 1]
42-
u += self.type2test([0, 1])
43+
u += self.type2test([0, 1]) # type: ignore
4344
assert u == [0, 1, 0, 1]
4445

46+
@no_type_check
4547
def test_mixedcmp(self):
4648
u = self.type2test([0, 1])
4749
assert u == [0, 1]
4850
assert u != [0]
4951
assert u != [0, 2]
5052

53+
@no_type_check
5154
def test_mixedadd(self):
5255
u = self.type2test([0, 1])
5356
assert u + [] == u
5457
assert u + [2] == [0, 1, 2]
5558

59+
@no_type_check
5660
def test_userlist_copy(self):
5761
u = self.type2test([6, 8, 1, 9, 1])
5862
v = u.copy()

0 commit comments

Comments
 (0)