Update type hints

Author: domdfcoding

domdf_python_tools/bases.py

@@ -456,7 +456,7 @@ def __rmod__(self: _F, other: float) -> _F:
 		return self.__class__(float(self).__rmod__(other))
 
 	def __rdivmod__(self: _F, other: float) -> Tuple[_F, _F]:
-		return tuple(self.__class__(x) for x in float(self).__rdivmod__(other))  # type: ignore
+		return tuple(self.__class__(x) for x in float(self).__rdivmod__(other))  # type: ignore[return-value]
 
 	def __rpow__(self: _F, other: float, mod=None) -> _F:
 		return self.__class__(float(self).__rpow__(other, mod))
@@ -471,7 +471,13 @@ def __trunc__(self) -> int:
 
 		return float(self).__trunc__()
 
-	def __round__(self, ndigits: Optional[int] = None) -> Union[int, float]:  # type: ignore
+	@overload
+	def __round__(self, ndigits: None = ...) -> int: ...
+
+	@overload
+	def __round__(self, ndigits: int) -> float: ...
+
+	def __round__(self, ndigits: Optional[int] = None) -> Union[int, float]:
 		"""
 		Round the :class:`~.UserFloat` to ``ndigits`` decimal places, defaulting to ``0``.
 
@@ -622,7 +628,7 @@ def replace(self: _LU, what: _T, with_: _T) -> _LU:
 
 		return self
 
-	def sort(  # type: ignore
+	def sort(  # type: ignore[override]
 			self: _LU,
 			*,
 			key=None,
@@ -643,39 +649,39 @@ def sort(  # type: ignore
 		super().sort(key=key, reverse=reverse)
 		return self
 
-	def reverse(self: _LU) -> _LU:  # type: ignore  # noqa: D102
+	def reverse(self: _LU) -> _LU:  # type: ignore[override]  # noqa: D102
 		super().reverse()
 		return self
 
-	def append(  # type: ignore  # noqa: D102
+	def append(  # type: ignore[override]  # noqa: D102
 			self: _LU,
 			item: _T,
 			) -> _LU:
 		super().append(item)
 		return self
 
-	def extend(  # type: ignore  # noqa: D102
+	def extend(  # type: ignore[override]  # noqa: D102
 			self: _LU,
 			other: Iterable[_T],
 			) -> _LU:
 		super().extend(other)
 		return self
 
-	def insert(  # type: ignore  # noqa: D102
+	def insert(  # type: ignore[override]  # noqa: D102
 			self: _LU,
 			i: int,
 			item: _T,
 			) -> _LU:
 		super().insert(i, item)
 		return self
 
-	def remove(  # type: ignore  # noqa: D102
+	def remove(  # type: ignore[override]  # noqa: D102
 			self: _LU,
 			item: _T,
 			) -> _LU:
 		super().remove(item)
 		return self
 
-	def clear(self: _LU) -> _LU:  # type: ignore  # noqa: D102
+	def clear(self: _LU) -> _LU:  # type: ignore[override]  # noqa: D102
 		super().clear()
 		return self

domdf_python_tools/dates.py

@@ -147,7 +147,7 @@ def utc_timestamp_to_datetime(
 if sys.version_info <= (3, 7, 2):  # pragma: no cover (py37+)
 	MonthsType = OrderedDict
 else:  # pragma: no cover (<py37)
-	MonthsType = typing.OrderedDict[str, str]  # type: ignore  # noqa: TYP006
+	MonthsType = typing.OrderedDict[str, str]  # type: ignore[misc,assignment]  # noqa: TYP006
 
 #: Mapping of 3-character shortcodes to full month names.
 months: MonthsType = OrderedDict(
@@ -195,7 +195,8 @@ def parse_month(month: Union[str, int]) -> str:
 		month = int(month)
 	except ValueError:
 		try:
-			return months[month.capitalize()[:3]]  # type: ignore
+			assert not isinstance(month, int)
+			return months[month.capitalize()[:3]]
 		except KeyError:
 			raise ValueError(error_text)
 

domdf_python_tools/delegators.py

@@ -82,7 +82,7 @@ def _f(f: _C) -> _C:
 				if param in to_params:
 					del to_params[param]
 
-			f.__signature__ = from_sig.replace(  # type: ignore
+			f.__signature__ = from_sig.replace(  # type: ignore[attr-defined]
 				parameters=[*from_params.values(), *to_params.values()]
 				)
 			f.__annotations__ = {**to_annotations, **from_annotations}
@@ -116,11 +116,11 @@ def _f(f: _C) -> _C:
 		from_params = dict(from_sig.parameters)
 
 		if tuple(from_params.keys()) == ("args", "kwargs"):
-			f.__signature__ = to_sig  # type: ignore
+			f.__signature__ = to_sig  # type: ignore[attr-defined]
 			copy_annotations(f)
 
 		elif tuple(from_params.keys()) == ("self", "args", "kwargs"):
-			f.__signature__ = from_sig.replace(  # type: ignore
+			f.__signature__ = from_sig.replace(  # type: ignore[attr-defined]
 				parameters=[from_params["self"], *to_sig.parameters.values()]
 				)
 

domdf_python_tools/iterative.py

@@ -501,4 +501,4 @@ def __init_subclass__(cls, **kwargs):
 
 	count.__qualname__ = count.__name__ = "count"
 
-	return count()  # type: ignore
+	return count()  # type: ignore[return-value]

domdf_python_tools/paths.py

@@ -388,19 +388,19 @@ class PathPlus(pathlib.Path):
 	__slots__ = ()
 
 	if sys.version_info < (3, 11):
-		_accessor = pathlib._normal_accessor  # type: ignore
+		_accessor = pathlib._normal_accessor  # type: ignore[attr-defined]
 	_closed = False
 
 	def _init(self, *args, **kwargs):
 		pass
 
 	@classmethod
 	def _from_parts(cls, args, init=True):
-		return super()._from_parts(args)  # type: ignore
+		return super()._from_parts(args)  # type: ignore[misc]
 
 	def __new__(cls: Type[_PP], *args, **kwargs) -> _PP:  # noqa: D102
 		if cls is PathPlus:
-			cls = WindowsPathPlus if os.name == "nt" else PosixPathPlus  # type: ignore
+			cls = WindowsPathPlus if os.name == "nt" else PosixPathPlus  # type: ignore[assignment]
 
 		return super().__new__(cls, *args, **kwargs)
 
@@ -630,7 +630,7 @@ def dump_json(
 			data: Any,
 			encoding: Optional[str] = "UTF-8",
 			errors: Optional[str] = None,
-			json_library: JsonLibrary = json,  # type: ignore
+			json_library: JsonLibrary = json,  # type: ignore[assignment]
 			*,
 			compress: bool = False,
 			**kwargs,
@@ -674,7 +674,7 @@ def load_json(
 			self,
 			encoding: Optional[str] = "UTF-8",
 			errors: Optional[str] = None,
-			json_library: JsonLibrary = json,  # type: ignore
+			json_library: JsonLibrary = json,  # type: ignore[assignment]
 			*,
 			decompress: bool = False,
 			**kwargs,
@@ -1255,7 +1255,7 @@ def phase4(self) -> None:  # noqa: D102
 			"right_list": filecmp.dircmp.phase0
 			}
 
-	methodmap = _methodmap  # type: ignore
+	methodmap = _methodmap  # type: ignore[assignment]
 
 
 def compare_dirs(a: PathLike, b: PathLike) -> bool:

domdf_python_tools/pretty_print.py

@@ -45,14 +45,14 @@
 
 	# 3rd party
 	from pprint36 import PrettyPrinter
-	from pprint36._pprint import _safe_key  # type: ignore
+	from pprint36._pprint import _safe_key  # type: ignore[attr-defined]
 
 	supports_sort_dicts = True
 
 except ImportError:
 
 	# stdlib
-	from pprint import PrettyPrinter, _safe_key  # type: ignore
+	from pprint import PrettyPrinter, _safe_key  # type: ignore[attr-defined]
 
 	supports_sort_dicts = sys.version_info >= (3, 8)
 
@@ -107,21 +107,21 @@ def __init__(
 	_dispatch: MutableMapping[Callable, Callable]
 	_indent_per_level: int
 	_format_items: ClassVar[Callable[[PrettyPrinter, Any, Any, Any, Any, Any, Any], None]]
-	_dispatch = dict(PrettyPrinter._dispatch)  # type: ignore
+	_dispatch = dict(PrettyPrinter._dispatch)  # type: ignore[attr-defined]
 
 	def _make_open(self, char: str, indent: int, obj):
 		if self._indent_per_level > 1:
 			the_indent = ' ' * (indent + 1)
 		else:
 			the_indent = ' ' * (indent + self._indent_per_level)
 
-		if obj and not self._compact:  # type: ignore
+		if obj and not self._compact:  # type: ignore[attr-defined]
 			return f"{char}\n{the_indent}"
 		else:
 			return char
 
 	def _make_close(self, char: str, indent: int, obj):
-		if obj and not self._compact:  # type: ignore
+		if obj and not self._compact:  # type: ignore[attr-defined]
 			return f",\n{' ' * (indent + self._indent_per_level)}{char}"
 		else:
 			return char
@@ -143,14 +143,14 @@ def _pprint_dict(
 			write((self._indent_per_level - 1) * ' ')
 
 		if obj:
-			self._format_dict_items(  # type: ignore
-					obj.items(),
-					stream,
-					indent,
-					allowance + 1,
-					context,
-					level,
-					)
+			self._format_dict_items(  # type: ignore[attr-defined]
+				obj.items(),
+				stream,
+				indent,
+				allowance + 1,
+				context,
+				level,
+				)
 
 		write(self._make_close('}', indent, obj))
 
@@ -243,7 +243,7 @@ def _format_attribute_items(self, items, stream, indent, allowance, context, lev
 			last = i == last_index
 			write(key)
 			write('=')
-			self._format(  # type: ignore
+			self._format(  # type: ignore[attr-defined]
 				ent,
 				stream,
 				indent + len(key) + 2,
@@ -284,7 +284,7 @@ def __repr__(self) -> str:
 		__repr__.__name__ = "__repr__"
 		__repr__.__module__ = obj.__module__
 		__repr__.__qualname__ = f"{obj.__module__}.__repr__"
-		obj.__repr__ = __repr__  # type: ignore
+		obj.__repr__ = __repr__  # type: ignore[assignment]
 
 		return obj
 

domdf_python_tools/stringlist.py

@@ -411,7 +411,7 @@ def with_indent(self, indent: Union[String, Indent], size: int = 0):
 		:param size: If ``indent`` is an indent type, the indent size to use within the ``with`` block.
 		"""
 
-		original_indent: Tuple[int, str] = tuple(self.indent)  # type: ignore
+		original_indent: Tuple[int, str] = tuple(self.indent)  # type: ignore[assignment]
 
 		try:
 			self.set_indent(indent, size)

domdf_python_tools/terminal.py

@@ -170,26 +170,22 @@ def __init__(self, indent: str = ' ' * 2):
 		if frame is None:  # pragma: no cover
 			raise ValueError("Unable to obtain the frame of the caller.")
 		else:
-			self.parent_frame = inspect.currentframe().f_back  # type: ignore  # TODO
+			self.parent_frame = inspect.currentframe().f_back  # type: ignore[union-attr]   # TODO
 
 	def __enter__(self):
 		"""
 		Called when entering the context manager.
 		"""
 
-		self.locals_on_entry = self.parent_frame.f_locals.copy()  # type: ignore
+		self.locals_on_entry = self.parent_frame.f_locals.copy()  # type: ignore[union-attr]
 
 	def __exit__(self, *args, **kwargs):
 		"""
 		Called when exiting the context manager.
 		"""
 
-		new_locals = {
-				k: v
-				for k,
-				v in self.parent_frame.f_locals.items()  # type: ignore
-				if k not in self.locals_on_entry
-				}
+		f_locals = self.parent_frame.f_locals  # type: ignore[union-attr]
+		new_locals = {k: v for k, v in f_locals.items() if k not in self.locals_on_entry}
 
 		print(textwrap.indent(pprint.pformat(new_locals), self.indent))
 

domdf_python_tools/typing.py

@@ -109,7 +109,7 @@ def check_membership(obj: Any, type_: Union[Type, object]) -> bool:
 		such as a :class:`typing.List`, :py:data:`typing.Union` or :py:class:`typing.Sequence`.
 	"""
 
-	return isinstance(obj, type_.__args__)  # type: ignore
+	return isinstance(obj, type_.__args__)  # type: ignore[union-attr]
 
 
 class JsonLibrary(Protocol):

domdf_python_tools/utils.py

@@ -444,11 +444,11 @@ def head(obj: Union[Tuple, List, "DataFrame", "Series", String, HasHead], n: int
 	elif isinstance(obj, HasHead):
 		return obj.head(n).to_string()
 
-	elif len(obj) <= n:  # type: ignore
+	elif len(obj) <= n:  # type: ignore[arg-type]
 		return str(obj)
 
 	else:
-		return str(obj[:n]) + etc  # type: ignore
+		return str(obj[:n]) + etc  # type: ignore[index]
 
 
 def magnitude(x: float) -> int:
@@ -553,7 +553,7 @@ def divide(string: str, sep: str) -> Tuple[str, str]:
 		raise ValueError(f"{sep!r} not in {string!r}")
 
 	parts = string.split(sep, 1)
-	return tuple(parts)  # type: ignore
+	return tuple(parts)  # type: ignore[return-value]
 
 
 def redivide(string: str, pat: Union[str, Pattern]) -> Tuple[str, str]:
@@ -577,7 +577,7 @@ def redivide(string: str, pat: Union[str, Pattern]) -> Tuple[str, str]:
 		raise ValueError(f"{pat!r} has no matches in {string!r}")
 
 	parts = pat.split(string, 1)
-	return tuple(parts)  # type: ignore
+	return tuple(parts)  # type: ignore[return-value]
 
 
 @overload