Update type annotations (#3322)

* refactor: update Callable type hint

* refactor: update type annotations for hooks

pylib/anki/_legacy.py

@@ -8,7 +8,8 @@ import os
 import pathlib
 import sys
 import traceback
-from typing import TYPE_CHECKING, Any, Callable, Union
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, Union
 
 from anki._vendor import stringcase  # type: ignore
 

pylib/anki/dbproxy.py

@@ -4,9 +4,9 @@
 from __future__ import annotations
 
 import re
-from collections.abc import Iterable, Sequence
+from collections.abc import Callable, Iterable, Sequence
 from re import Match
-from typing import TYPE_CHECKING, Any, Callable, Union
+from typing import TYPE_CHECKING, Any, Union
 
 if TYPE_CHECKING:
     import anki._backend

pylib/anki/httpclient.py

@@ -9,7 +9,8 @@ from __future__ import annotations
 
 import io
 import os
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import requests
 from requests import Response

pylib/anki/importing/__init__.py

@@ -1,8 +1,8 @@
 # Copyright: Ankitects Pty Ltd and contributors
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
-from typing import Any, Callable, Type, Union
+from typing import Any, Type, Union
 
 import anki
 from anki.collection import Collection

pylib/anki/media.py

@@ -8,8 +8,7 @@ import pprint
 import re
 import sys
 import time
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
-from typing import Callable
 
 from anki import media_pb2
 from anki._legacy import DeprecatedNamesMixin, deprecated_keywords

pylib/anki/stdmodels.py

@@ -3,7 +3,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 import anki.collection
 import anki.models

pylib/anki/utils.py

@@ -13,10 +13,10 @@ import subprocess
 import sys
 import tempfile
 import time
-from collections.abc import Iterable, Iterator
+from collections.abc import Callable, Iterable, Iterator
 from contextlib import contextmanager
 from hashlib import sha1
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from anki._legacy import DeprecatedNamesMixinForModule
 from anki.dbproxy import DBProxy

pylib/tests/test_schedv3.py

@@ -4,7 +4,8 @@
 import copy
 import os
 import time
-from typing import Callable, Dict
+from collections.abc import Callable
+from typing import Dict
 
 import pytest
 

pylib/tools/genhooks.py

@@ -137,7 +137,9 @@ prefix = """\
 
 from __future__ import annotations
 
-from typing import Any, Callable, Sequence
+from collections.abc import Callable, Sequence
+from typing import Any
+
 import anki
 import anki.hooks
 from anki.cards import Card

qt/aqt/_macos_helper.py

@@ -5,8 +5,8 @@ from __future__ import annotations
 
 import os
 import sys
+from collections.abc import Callable
 from ctypes import CDLL, CFUNCTYPE, c_bool, c_char_p
-from typing import Callable
 
 import aqt
 import aqt.utils

qt/aqt/addcards.py

@@ -3,7 +3,7 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 import aqt.editor
 import aqt.forms

qt/aqt/addons.py

@@ -11,12 +11,12 @@ import os
 import re
 import zipfile
 from collections import defaultdict
-from collections.abc import Iterable, Sequence
+from collections.abc import Callable, Iterable, Sequence
 from concurrent.futures import Future
 from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
-from typing import IO, Any, Callable, Union
+from typing import IO, Any, Union
 from urllib.parse import parse_qs, urlparse
 from zipfile import ZipFile
 

qt/aqt/browser/browser.py

@@ -6,8 +6,8 @@ from __future__ import annotations
 import json
 import math
 import re
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
-from typing import Any, Callable
+from typing import Any
 
 import aqt
 import aqt.browser

qt/aqt/browser/card_info.py

@@ -3,7 +3,7 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 import aqt
 from anki.cards import Card, CardId

qt/aqt/browser/previewer.py

@@ -6,7 +6,8 @@ from __future__ import annotations
 import json
 import re
 import time
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 import aqt.browser
 from anki.cards import Card

qt/aqt/browser/sidebar/item.py

@@ -2,9 +2,8 @@
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 from __future__ import annotations
 
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from enum import Enum, auto
-from typing import Callable
 
 from anki.collection import SearchNode
 from aqt.theme import ColoredIcon

qt/aqt/browser/table/model.py

@@ -3,8 +3,8 @@
 from __future__ import annotations
 
 import time
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
-from typing import Any, Callable
+from typing import Any
 
 import aqt
 import aqt.browser

qt/aqt/browser/table/table.py

@@ -2,8 +2,8 @@
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
-from typing import Any, Callable
+from typing import Any
 
 import aqt
 import aqt.browser

qt/aqt/editor.py

@@ -14,9 +14,10 @@ import urllib.error
 import urllib.parse
 import urllib.request
 import warnings
+from collections.abc import Callable
 from enum import Enum
 from random import randrange
-from typing import Any, Callable, Match, cast
+from typing import Any, Match, cast
 
 import bs4
 import requests

qt/aqt/mediasrv.py

@@ -11,10 +11,10 @@ import re
 import sys
 import threading
 import traceback
+from collections.abc import Callable
 from dataclasses import dataclass
 from errno import EPROTOTYPE
 from http import HTTPStatus
-from typing import Callable
 
 import flask
 import flask_cors

qt/aqt/mediasync.py

@@ -4,9 +4,10 @@
 from __future__ import annotations
 
 import time
+from collections.abc import Callable
 from concurrent.futures import Future
 from datetime import datetime
-from typing import Any, Callable
+from typing import Any
 
 import aqt
 import aqt.forms

qt/aqt/operations/__init__.py

@@ -3,8 +3,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from concurrent.futures._base import Future
-from typing import Any, Callable, Generic, Protocol, TypeVar, Union
+from typing import Any, Generic, Protocol, TypeVar, Union
 
 import aqt
 import aqt.gui_hooks

qt/aqt/overview.py

@@ -2,8 +2,9 @@
 # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Any, Callable
+from typing import Any
 
 import aqt
 import aqt.operations

qt/aqt/qt/__init__.py

@@ -7,7 +7,8 @@
 import os
 import sys
 import traceback
-from typing import Callable, TypeVar, Union
+from collections.abc import Callable
+from typing import TypeVar, Union
 
 try:
     import PyQt6

qt/aqt/sound.py

@@ -11,10 +11,11 @@ import sys
 import time
 import wave
 from abc import ABC, abstractmethod
+from collections.abc import Callable
 from concurrent.futures import Future
 from operator import itemgetter
 from pathlib import Path
-from typing import Any, Callable, cast
+from typing import Any, cast
 
 from markdown import markdown
 

qt/aqt/studydeck.py

@@ -3,7 +3,7 @@
 
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 import aqt
 import aqt.forms

qt/aqt/sync.py

@@ -4,8 +4,8 @@
 from __future__ import annotations
 
 import os
+from collections.abc import Callable
 from concurrent.futures import Future
-from typing import Callable
 
 import aqt
 import aqt.main

qt/aqt/taskman.py

@@ -9,10 +9,11 @@ See QueryOp() and CollectionOp() for higher-level routines.
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from concurrent.futures import Future
 from concurrent.futures.thread import ThreadPoolExecutor
 from threading import Lock, current_thread, main_thread
-from typing import Any, Callable
+from typing import Any
 
 import aqt
 from anki.collection import Progress

qt/aqt/theme.py

@@ -7,8 +7,8 @@ import enum
 import os
 import re
 import subprocess
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable
 
 import anki.lang
 import aqt

qt/aqt/utils.py

@@ -9,10 +9,10 @@ import re
 import shutil
 import subprocess
 import sys
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from functools import partial, wraps
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Literal, Union
+from typing import TYPE_CHECKING, Any, Literal, Union
 
 from send2trash import send2trash
 

qt/aqt/webview.py

@@ -7,9 +7,9 @@ import dataclasses
 import json
 import re
 import sys
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Callable, cast
+from typing import TYPE_CHECKING, Any, cast
 
 import anki
 import anki.lang