Lint

Author: domdfcoding

tests/discover_demo_module/submodule_a.py

@@ -1,6 +1,6 @@
-def foo():
+def foo():  # noqa
 	pass
 
 
-def bar():
+def bar():  # noqa
 	pass

tests/list_tests.py

@@ -296,13 +296,13 @@ def test_extend(self):
 		# overflow test. issue1621
 		class CustomIter:
 
-			def __iter__(self):
+			def __iter__(self):  # noqa: MAN002
 				return self
 
-			def __next__(self):
+			def __next__(self):  # noqa: MAN002
 				raise StopIteration
 
-			def __length_hint__(self):
+			def __length_hint__(self):  # noqa: MAN002
 				return sys.maxsize
 
 		a = self.type2test([1, 2, 3, 4])
@@ -378,7 +378,7 @@ class BadExc(Exception):
 
 		class BadCmp:
 
-			def __eq__(self, other):
+			def __eq__(self, other):  # noqa: MAN001,MAN002
 				if other == 2:
 					raise BadExc()
 				return False
@@ -389,7 +389,7 @@ def __eq__(self, other):
 
 		class BadCmp2:
 
-			def __eq__(self, other):
+			def __eq__(self, other):  # noqa: MAN001,MAN002
 				raise BadExc()
 
 		d = self.type2test("abcdefghcij")
@@ -422,10 +422,10 @@ def test_index(self):
 		# Test modifying the list during index's iteration
 		class EvilCmp:
 
-			def __init__(self, victim):
+			def __init__(self, victim):  # noqa: MAN001
 				self.victim = victim
 
-			def __eq__(self, other):
+			def __eq__(self, other):  # noqa: MAN001,MAN002
 				del self.victim[:]
 				return False
 
@@ -501,7 +501,7 @@ def test_sort(self):
 		with pytest.raises(TypeError):
 			u.sort(42, 42)
 
-		def revcmp(a, b):
+		def revcmp(a, b):  # noqa: MAN001,MAN002
 			if a == b:
 				return 0
 			elif a < b:
@@ -602,7 +602,7 @@ def test_constructor_exception_handling(self):
 		# Bug #1242657
 		class F:
 
-			def __iter__(self):
+			def __iter__(self):  # noqa: MAN002
 				raise KeyboardInterrupt
 
 		with pytest.raises(KeyboardInterrupt):

tests/test_bases.py

@@ -64,7 +64,7 @@ def test_creation(self, alice):
 		assert alice.age == 20
 		assert alice.occupation == "IRC Lurker"
 
-	def test_str(self, alice):
+	def test_str(self, alice: object):
 		assert str(alice).startswith("<tests.test_bases.Person")
 
 	def test_equality(self):

tests/test_dir_comparator.py

@@ -12,7 +12,6 @@
 import shutil
 from contextlib import redirect_stdout
 from io import StringIO
-from types import SimpleNamespace
 
 # 3rd party
 import pytest
@@ -21,9 +20,18 @@
 from domdf_python_tools.paths import DirComparator, PathPlus, compare_dirs
 
 
+class ComparatorTmpdirData:
+	__slots__ = ("dir", "dir_same", "dir_diff", "dir_ignored", "caseinsensitive")
+	dir: str  # noqa: A003  # pylint: disable=redefined-builtin
+	dir_same: str
+	dir_diff: str
+	dir_ignored: str
+	caseinsensitive: bool
+
+
 @pytest.fixture()
-def comparator_tmpdir(tmp_pathplus):
-	data = SimpleNamespace()
+def comparator_tmpdir(tmp_pathplus: PathPlus) -> ComparatorTmpdirData:
+	data = ComparatorTmpdirData()
 	data.dir = os.path.join(tmp_pathplus, "dir")
 	data.dir_same = os.path.join(tmp_pathplus, "dir-same")
 	data.dir_diff = os.path.join(tmp_pathplus, "dir-diff")

tests/test_getters.py

@@ -8,6 +8,7 @@
 
 # stdlib
 import pickle
+from typing import Any
 
 # 3rd party
 import pytest
@@ -276,10 +277,10 @@ class A:
 			def foo(self, *args, **kwds):
 				return args[0] + args[1]
 
-			def bar(self, f=42):
+			def bar(self, f=42):  # noqa: MAN001,MAN002
 				return f
 
-			def baz(*args, **kwds):
+			def baz(*args, **kwds):  # noqa: MAN002
 				return kwds["name"], kwds["self"]
 
 		a = A()
@@ -370,6 +371,6 @@ def test_repr(self):
 		evaluate(repr(methodcaller(1, "__iter__", "arg1", "arg2", kw1="kwarg1", kw2="kwarg2")))
 
 
-def copy(obj, proto):
+def copy(obj: Any, proto: int):
 	pickled = pickle.dumps(obj, proto)
 	return pickle.loads(pickled)  # nosec: B301

tests/test_iterative.py

@@ -21,7 +21,7 @@
 from itertools import islice
 from random import shuffle
 from types import GeneratorType
-from typing import List, Tuple
+from typing import Any, Iterable, List, Optional, Sequence, Tuple, TypeVar
 
 # 3rd party
 import pytest
@@ -241,7 +241,7 @@ def test_ranges_from_iterable():
 	assert list(ranges_from_iterable([1, 2, 3, 4, 5, 7, 8, 9, 10])) == expects
 
 
-def _extend_param(sequence, expects):
+def _extend_param(sequence: Sequence, expects: Any):
 	return pytest.param(sequence, expects, id=sequence)
 
 
@@ -257,7 +257,7 @@ def _extend_param(sequence, expects):
 				pytest.param(['a', 'b', 'c', 'd', 'e'], "abcde", id="list"),
 				]
 		)
-def test_extend(sequence, expects):
+def test_extend(sequence: Sequence[str], expects: str):
 	assert ''.join(extend(sequence, 4)) == expects
 
 
@@ -273,7 +273,7 @@ def test_extend(sequence, expects):
 				pytest.param(['a', 'b', 'c', 'd', 'e'], "abcde", id="list"),
 				]
 		)
-def test_extend_with(sequence, expects):
+def test_extend_with(sequence: Sequence[str], expects: str):
 	assert ''.join(extend_with(sequence, 4, 'z')) == expects
 
 
@@ -294,7 +294,10 @@ def lzip(*args):
 	return list(zip(*args))
 
 
-def take(n, seq):
+_T = TypeVar("_T")
+
+
+def take(n: Optional[int], seq: Iterable[_T]) -> List[_T]:
 	"""
 	Convenience function for partially consuming a long of infinite iterable
 	"""
@@ -417,7 +420,7 @@ def test_count_with_stride():
 			# 	pickletest(proto, count(i, j))
 
 
-def pickletest(protocol, it, stop=4, take=1, compare=None):
+def pickletest(protocol: int, it, stop: int = 4, take: int = 1, compare=None):
 	"""
 	Test that an iterator is the same after pickling, also when part-consumed
 	"""

tests/test_pagesizes/test_pagesizes.py

@@ -8,6 +8,7 @@
 
 # stdlib
 from math import isclose
+from typing import List, Tuple, Type
 
 # 3rd party
 import pytest
@@ -28,6 +29,7 @@
 		Size_mm,
 		Size_pica,
 		Size_um,
+		Unit,
 		cm,
 		convert_from,
 		inch,
@@ -65,7 +67,7 @@
 						),
 				],
 		)
-def test_repr(obj, expects):
+def test_repr(obj: Unit, expects: str):
 	assert repr(obj) == expects
 
 
@@ -78,12 +80,12 @@ def test_repr(obj, expects):
 				(Size_pica(12, 34), "Size_pica(width=12, height=34)"),
 				],
 		)
-def test_str(obj, expects):
+def test_str(obj: Unit, expects: str):
 	assert str(obj) == expects
 
 
 @pytest.mark.parametrize("size", [A6, A5, A4, A3, A2, A1, A0])
-def test_orientation(size):
+def test_orientation(size: BaseSize):
 	assert size.is_portrait()
 	assert size.portrait().is_portrait()
 	assert size.landscape().portrait().is_portrait()
@@ -106,7 +108,7 @@ def test_is_square():
 
 
 @pytest.mark.parametrize("unit", [pt, inch, cm, mm, um, pc])
-def test_convert_size(unit):
+def test_convert_size(unit: Unit):
 	size = PageSize(12, 34, unit)
 	unit_str = unit.name
 	if unit_str == "µm":
@@ -176,7 +178,7 @@ def test_convert_size(unit):
 				pytest.param(2, 5, 10, id="not isinstance(from_, Unit)"),
 				],
 		)
-def test_convert_from(value, unit, expects):
+def test_convert_from(value: List[int], unit, expects: Tuple[float, ...]):
 	assert convert_from(value, unit) == expects
 
 
@@ -187,7 +189,7 @@ def test_convert_from(value, unit, expects):
 				((12, 34), Size_mm(12, 34), Size_mm),
 				],
 		)
-def test_from_size(size, expected, class_):
+def test_from_size(size: Tuple[int, int], expected: Unit, class_: Type[BaseSize]):
 	print(class_.from_size(size))
 	assert class_.from_size(size) == expected
 
@@ -210,7 +212,7 @@ def test_from_size(size, expected, class_):
 				("10μm", [("10", "μm")]),
 				],
 		)
-def test_measurement_re(string, expects):
+def test_measurement_re(string: str, expects: Unit):
 	assert _measurement_re.findall(string) == expects
 
 
@@ -261,5 +263,5 @@ def test_parse_measurement_errors():
 				("5in", 5 * inch),
 				],
 		)
-def test_parse_measurement(string, expects):
+def test_parse_measurement(string: str, expects: Unit):
 	assert parse_measurement(string) == expects