Fix some lint errors found by the updated linters

Author: sbp

atr/static/js/src/upload-progress.js

@@ -55,15 +55,15 @@ function setupXhrHandlers(
 	ui,
 	index,
 	state,
-	addRetryButton,
-	checkAllComplete,
+	addRetryButtonFn,
+	checkAllCompleteFn,
 ) {
 	const ctx = {
 		ui,
 		index,
 		state,
-		addRetryButton,
-		checkAllComplete,
+		addRetryButton: addRetryButtonFn,
+		checkAllComplete: checkAllCompleteFn,
 		activeUploads: state.activeUploads,
 		statusEl: ui.querySelector(".upload-status"),
 		cancelBtn: ui.querySelector(".cancel-btn"),
@@ -109,13 +109,13 @@ function startUpload(
 	state,
 	stageUrl,
 	csrfToken,
-	addRetryButton,
+	addRetryButtonFn,
 	checkComplete,
 ) {
 	const ui = document.getElementById(`upload-file-${index}`);
 	const xhr = new XMLHttpRequest();
 	state.activeUploads.set(index, xhr);
-	setupXhrHandlers(xhr, ui, index, state, addRetryButton, checkComplete);
+	setupXhrHandlers(xhr, ui, index, state, addRetryButtonFn, checkComplete);
 	const formData = new FormData();
 	formData.append("csrf_token", csrfToken);
 	formData.append("file", file, file.name);

atr/util.py

@@ -34,7 +34,7 @@
 import uuid
 import zipfile
 from collections.abc import AsyncGenerator, Callable, Iterable, Sequence
-from typing import Any, Final, TypeVar
+from typing import Any, Final
 
 import aiofiles.os
 import aiohttp
@@ -58,8 +58,6 @@
 import atr.tarzip as tarzip
 import atr.user as user
 
-T = TypeVar("T")
-
 ARCHIVE_ROOT_SUFFIXES: Final[tuple[str, ...]] = ("-source", "-src")
 DIRECTORY_PERMISSIONS: Final[int] = 0o755
 DEV_TEST_MID: Final[str] = "CAH5JyZo8QnWmg9CwRSwWY=GivhXW4NiLyeNJO71FKdK81J5-Uw@mail.gmail.com"
@@ -1152,7 +1150,7 @@ def unwrap[T](value: T | None, error_message: str = "unexpected None when unwrap
         return value
 
 
-def unwrap_type(value: T | None, t: type[T], error_message: str = "unexpected None when unwrapping value") -> T:
+def unwrap_type[T](value: T | None, t: type[T], error_message: str = "unexpected None when unwrapping value") -> T:
     """
     Will unwrap the given value or raise a TypeError if it is not of the expected type