Fix type hints.

Author: domdfcoding

domdf_python_tools/delegators.py

@@ -82,8 +82,8 @@ def _f(f: Callable):
 					del to_params[param]
 
 			f.__signature__ = from_sig.replace(  # type: ignore
-					parameters=[*from_params.values(), *to_params.values()]
-					)  # type: ignore
+				parameters=[*from_params.values(), *to_params.values()]
+				)  # type: ignore
 			f.__annotations__ = {**to_annotations, **from_annotations}
 
 		return f

tests/list_tests.py

@@ -12,10 +12,9 @@
 # stdlib
 import sys
 from functools import cmp_to_key
-
-# 3rd party
 from typing import List, no_type_check
 
+# 3rd party
 import pytest
 
 # this package

tests/seq_tests.py

@@ -12,10 +12,9 @@
 import pickle
 import sys
 from itertools import chain
-
-# 3rd party
 from typing import List
 
+# 3rd party
 import pytest
 
 # this package
@@ -219,19 +218,19 @@ def __getitem__(self, i):
 		v0 = self.type2test(s)
 		self.assertEqual(len(v0), len(s))
 
-		s = "this is also a sequence"
-		vv = self.type2test(s)
-		self.assertEqual(len(vv), len(s))
+		s2 = "this is also a sequence"
+		vv = self.type2test(s2)
+		self.assertEqual(len(vv), len(s2))
 
 		# Create from various iteratables
-		for s in ("123", "", range(1000), ('do', 1.2), range(2000, 2200, 5)):
+		for s2 in ("123", "", range(1000), ('do', 1.2), range(2000, 2200, 5)):  # type: ignore
 			for g in (Sequence, IterFunc, IterGen, itermulti, iterfunc):
-				self.assertEqual(self.type2test(g(s)), self.type2test(s))
-			self.assertEqual(self.type2test(IterFuncStop(s)), self.type2test())
+				self.assertEqual(self.type2test(g(s2)), self.type2test(s2))
+			self.assertEqual(self.type2test(IterFuncStop(s2)), self.type2test())
 			self.assertEqual(self.type2test(c for c in "123"), self.type2test("123"))
-			self.assertRaises(TypeError, self.type2test, IterNextOnly(s))
-			self.assertRaises(TypeError, self.type2test, IterNoNext(s))
-			self.assertRaises(ZeroDivisionError, self.type2test, IterGenExc(s))
+			self.assertRaises(TypeError, self.type2test, IterNextOnly(s2))
+			self.assertRaises(TypeError, self.type2test, IterNoNext(s2))
+			self.assertRaises(ZeroDivisionError, self.type2test, IterGenExc(s2))
 
 		# Issue #23757
 		self.assertEqual(self.type2test(LyingTuple((2, ))), self.type2test((1, )))

tests/test_pretty_print.py

@@ -12,10 +12,9 @@
 import itertools
 import random
 import types
-
-# 3rd party
 from typing import no_type_check
 
+# 3rd party
 import pytest
 from pytest_regressions.file_regression import FileRegressionFixture  # type: ignore
 

tests/test_userlist.py

@@ -8,21 +8,22 @@
 
 # Check every path through every method of UserList
 
-# this package
-from typing import Type
+# stdlib
+from typing import Sequence, Type, no_type_check
 
+# this package
 from domdf_python_tools.bases import UserList
 from domdf_python_tools.testing import not_pypy
 from tests import list_tests
 
 
 class TestList(list_tests.CommonTest):
-	type2test = list
+	type2test: Type[Sequence] = list
 
 	def test_getslice(self):
 		super().test_getslice()
 		l = [0, 1, 2, 3, 4]
-		u = self.type2test(l)
+		u = self.type2test(l)  # type: ignore
 		for i in range(-3, 6):
 			assert u[:i] == l[:i]
 			assert u[i:] == l[i:]
@@ -31,28 +32,31 @@ def test_getslice(self):
 
 	def test_slice_type(self):
 		l = [0, 1, 2, 3, 4]
-		u = self.type2test(l)
+		u = self.type2test(l)  # type: ignore
 		assert u[:] != u.__class__
 		assert u[:] == u
 
 	@not_pypy("Doesn't work on PyPy")
 	def test_iadd(self):
 		super().test_iadd()
 		u = [0, 1]
-		u += self.type2test([0, 1])
+		u += self.type2test([0, 1])  # type: ignore
 		assert u == [0, 1, 0, 1]
 
+	@no_type_check
 	def test_mixedcmp(self):
 		u = self.type2test([0, 1])
 		assert u == [0, 1]
 		assert u != [0]
 		assert u != [0, 2]
 
+	@no_type_check
 	def test_mixedadd(self):
 		u = self.type2test([0, 1])
 		assert u + [] == u
 		assert u + [2] == [0, 1, 2]
 
+	@no_type_check
 	def test_userlist_copy(self):
 		u = self.type2test([6, 8, 1, 9, 1])
 		v = u.copy()