Fixing type hints.

Author: domdfcoding

domdf_python_tools/bases.py

@@ -97,7 +97,7 @@ def __eq__(self, other) -> bool:
 
 
 _T = TypeVar("_T")
-_S = TypeVar('_S')
+_S = TypeVar('_S', bound="UserList")
 
 
 @prettify_docstrings
@@ -197,7 +197,7 @@ def __setitem__(self, i: slice, o: Iterable[_T]) -> None:
 		...  # pragma: no cover
 
 	def __setitem__(self, i: Union[int, slice], item: Union[_T, Iterable[_T]]) -> None:
-		self.data[i] = item
+		self.data[i] = item  # type: ignore
 
 	def __delitem__(self, i: Union[int, slice]):
 		del self.data[i]

domdf_python_tools/delegators.py

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

tests/list_tests.py

@@ -14,6 +14,8 @@
 from functools import cmp_to_key
 
 # 3rd party
+from typing import List, no_type_check
+
 import pytest
 
 # this package
@@ -43,18 +45,20 @@ def test_init(self):
 		self.assertNotEqual(id(a), id(b))
 		self.assertEqual(a, b)
 
+	@no_type_check
 	def test_getitem_error(self):
 		a = []
 		with pytest.raises(TypeError, match="list indices must be integers or slices"):
 			a['a']
 
+	@no_type_check
 	def test_setitem_error(self):
 		a = []
 		with pytest.raises(TypeError, match="list indices must be integers or slices"):
 			a['a'] = "python"
 
 	def test_repr(self):
-		l0 = []
+		l0: List = []
 		l2 = [0, 1, 2]
 		a0 = self.type2test(l0)
 		a2 = self.type2test(l2)

tests/seq_tests.py

@@ -14,6 +14,8 @@
 from itertools import chain
 
 # 3rd party
+from typing import List
+
 import pytest
 
 # this package
@@ -173,7 +175,7 @@ def __iter__(self):
 
 class CommonTest:
 	# The type to be tested
-	type2test = None
+	type2test: type
 
 	def assertEqual(self, left, right):
 		assert left == right
@@ -186,7 +188,7 @@ def assertRaises(self, what, func, *args):
 			func(*args)
 
 	def test_constructors(self):
-		l0 = []
+		l0: List = []
 		l1 = [0]
 		l2 = [0, 1]
 
@@ -370,7 +372,7 @@ def test_addmul(self):
 		self.assertEqual(u2 + u2 + u2, u2 * 3)
 		self.assertEqual(u2 + u2 + u2, 3 * u2)
 
-		class subclass(self.type2test):
+		class subclass(self.type2test):  # type: ignore
 			pass
 
 		u3 = subclass([0, 1])
@@ -399,7 +401,7 @@ def test_imul(self):
 
 	def test_getitemoverwriteiter(self):
 		# Verify that __getitem__ overrides are not recognized by __iter__
-		class T(self.type2test):
+		class T(self.type2test):  # type: ignore
 
 			def __getitem__(self, key):
 				return str(key) + '!!!'

tests/test_namedlist.py

@@ -10,7 +10,7 @@
 
 # stdlib
 import sys
-from typing import Callable
+from typing import Callable, Type, Union
 
 # this package
 from domdf_python_tools.bases import NamedList, UserList, namedlist
@@ -19,7 +19,7 @@
 
 
 class TestNamedList(TestList):
-	type2test = NamedList
+	type2test: Type[NamedList] = NamedList
 
 	def test_add_specials(self):
 		u = NamedList("spam")
@@ -58,7 +58,7 @@ class TestShoppingList(TestNamedList):
 	Test a subclass of NamedList.
 	"""
 
-	type2test = ShoppingList
+	type2test: Type[ShoppingList] = ShoppingList
 
 	def test_repr(self):
 		a0 = self.type2test([])
@@ -77,10 +77,11 @@ def test_repr(self):
 
 
 class NamedListTest:
-	shopping_list: Callable
+	shopping_list: Union[NamedList[str], Callable]
 
 	repr_out = "['egg and bacon', 'egg sausage and bacon', 'egg and spam', 'egg bacon and spam']"
 	str_out = "ShoppingList['egg and bacon', 'egg sausage and bacon', 'egg and spam', 'egg bacon and spam']"
+	cls_str: str
 
 	def test(self, capsys):
 		assert isinstance(self.shopping_list, UserList)

tests/test_pretty_print.py

@@ -14,8 +14,10 @@
 import types
 
 # 3rd party
+from typing import no_type_check
+
 import pytest
-from pytest_regressions.file_regression import FileRegressionFixture
+from pytest_regressions.file_regression import FileRegressionFixture  # type: ignore
 
 # this package
 from domdf_python_tools.pretty_print import FancyPrinter, simple_repr
@@ -140,6 +142,7 @@ def __hash__(self):
 
 class TestFancyPrinter:
 
+	@no_type_check
 	def test_init(self):
 		FancyPrinter()
 		FancyPrinter(indent=4, width=40, depth=5, stream=io.StringIO(), compact=True)
@@ -182,6 +185,7 @@ def test_basic(self, safe):
 		assert not pp.isrecursive(safe), f"expected not isrecursive for {safe!r}"
 		assert pp.isreadable(safe), f"expected isreadable for {safe!r}"
 
+	@no_type_check
 	def test_knotted(self):
 		a = list(range(100))
 		b = list(range(200))
@@ -278,6 +282,7 @@ def test_knotted(self):
 	# 		self.assertEqual(FancyPrinter().pformat(cont), expected)
 	# 		self.assertEqual(FancyPrinter(width=1, indent=0).pformat(cont), expected)
 
+	@no_type_check
 	def test_basic_line_wrap(self):
 		# verify basic line-wrapping operation
 		o = {
@@ -449,7 +454,7 @@ def test_sorted_dict(self):
 										(): {}}) == r"{5: [[]], 'xy\tab\n': (3,), (): {}}"
 
 	def test_ordered_dict(self, file_regression: FileRegressionFixture):
-		d = collections.OrderedDict()
+		d: collections.OrderedDict = collections.OrderedDict()
 		assert FancyPrinter(width=1).pformat(d) == 'OrderedDict()'
 		d = collections.OrderedDict([])
 		assert FancyPrinter(width=1).pformat(d) == 'OrderedDict()'
@@ -564,7 +569,7 @@ def test_sort_unorderable_values(self):
 		assert FancyPrinter().pformat({Unorderable: 0, 1: 0}) == '{1: 0, ' + repr(Unorderable) + ': 0}'
 
 		# Issue 14998: TypeError on tuples with NoneTypes as dict keys.
-		keys = [(1, ), (None, )]
+		keys = [(1, ), (None, )]  # type: ignore
 		assert FancyPrinter().pformat(dict.fromkeys(keys, 0)) == '{%r: 0, %r: 0}' % tuple(sorted(keys, key=id))
 
 	def test_sort_orderable_and_unorderable_values(self):
@@ -694,7 +699,7 @@ def test_compact_width(self):
 		number = 10
 		o = [0] * number
 		for i in range(levels - 1):
-			o = [o]
+			o = [o]  # type: ignore
 		for w in range(levels * 2 + 1, levels + 3 * number - 1):
 			lines = FancyPrinter(width=w, compact=True).pformat(o, ).splitlines()
 			maxwidth = max(map(len, lines))
@@ -811,20 +816,20 @@ def test_bytearray_wrap(self, value, width, file_regression: FileRegressionFixtu
 		self.check_file_regression(FancyPrinter(width=width).pformat(value), file_regression)
 
 	def test_default_dict(self, file_regression: FileRegressionFixture):
-		d = collections.defaultdict(int)
+		d: collections.defaultdict = collections.defaultdict(int)
 		assert FancyPrinter(width=1).pformat(d) == "defaultdict(<class 'int'>, {})"
 		words = 'the quick brown fox jumped over a lazy dog'.split()
 		d = collections.defaultdict(int, zip(words, itertools.count()))
 		self.check_file_regression(FancyPrinter().pformat(d), file_regression)
 
 	def test_counter(self, file_regression: FileRegressionFixture):
-		d = collections.Counter()
+		d: collections.Counter = collections.Counter()
 		assert FancyPrinter(width=1).pformat(d) == "Counter()"
 		d = collections.Counter('senselessness')
 		self.check_file_regression(FancyPrinter(width=40).pformat(d), file_regression)
 
 	def test_chainmap(self, file_regression: FileRegressionFixture):
-		d = collections.ChainMap()
+		d: collections.ChainMap = collections.ChainMap()
 		assert FancyPrinter(width=1).pformat(d) == "ChainMap({})"
 		words = 'the quick brown fox jumped over a lazy dog'.split()
 		items = list(zip(words, itertools.count()))
@@ -838,7 +843,7 @@ def test_chainmap_nested(self, file_regression: FileRegressionFixture):
 		self.check_file_regression(FancyPrinter().pformat(d), file_regression)
 
 	def test_deque(self):
-		d = collections.deque()
+		d: collections.deque = collections.deque()
 		assert FancyPrinter(width=1).pformat(d) == "deque([])"
 		d = collections.deque(maxlen=7)
 		assert FancyPrinter(width=1).pformat(d) == "deque([], maxlen=7)"
@@ -873,14 +878,14 @@ def check_file_regression(self, data, file_regression: FileRegressionFixture):
 		file_regression.check(data, extension=".txt", encoding="UTF-8")
 
 	def test_user_dict(self, file_regression: FileRegressionFixture):
-		d = collections.UserDict()
+		d: collections.UserDict = collections.UserDict()
 		assert FancyPrinter(width=1).pformat(d) == "{}"
 		words = 'the quick brown fox jumped over a lazy dog'.split()
-		d = collections.UserDict(zip(words, itertools.count()))
+		d = collections.UserDict(zip(words, itertools.count()))  # type: ignore
 		self.check_file_regression(FancyPrinter().pformat(d), file_regression)
 
 	def test_user_list(self, file_regression: FileRegressionFixture):
-		d = collections.UserList()
+		d: collections.UserList = collections.UserList()
 		assert FancyPrinter(width=1).pformat(d) == "[]"
 		words = 'the quick brown fox jumped over a lazy dog'.split()
 		d = collections.UserList(zip(words, itertools.count()))

tests/test_userlist.py

@@ -9,6 +9,8 @@
 # Check every path through every method of UserList
 
 # this package
+from typing import Type
+
 from domdf_python_tools.bases import UserList
 from domdf_python_tools.testing import not_pypy
 from tests import list_tests
@@ -59,7 +61,7 @@ def test_userlist_copy(self):
 
 
 class TestUserList(TestList):
-	type2test = UserList
+	type2test: Type[UserList] = UserList
 
 	def test_add_specials(self):
 		u = UserList("spam")