From bab83ffce02129426028e25a848d98ad1f1f5626 Mon Sep 17 00:00:00 2001 From: David Culley <6276049+davidculley@users.noreply.github.com> Date: Mon, 5 Aug 2024 06:34:46 +0200 Subject: [PATCH] fix: add proper imports (#3296) Co-authored-by: Damien Elmes --- pylib/anki/cards.py | 1 + qt/aqt/__init__.py | 1 + qt/aqt/addons.py | 2 ++ qt/aqt/browser/find_duplicates.py | 1 + qt/aqt/browser/sidebar/tree.py | 1 + qt/aqt/debug_console.py | 1 + qt/aqt/deckchooser.py | 1 + qt/aqt/errors.py | 4 ++++ qt/aqt/import_export/importing.py | 1 + qt/aqt/importing.py | 1 + qt/aqt/main.py | 2 ++ qt/aqt/preferences.py | 1 + qt/aqt/profiles.py | 2 ++ qt/aqt/progress.py | 1 + qt/aqt/reviewer.py | 1 + qt/aqt/sound.py | 1 + qt/aqt/stats.py | 1 + qt/aqt/tagedit.py | 1 + qt/aqt/taskman.py | 1 + qt/aqt/webview.py | 2 ++ 20 files changed, 27 insertions(+) diff --git a/pylib/anki/cards.py b/pylib/anki/cards.py index fc002eadc..8a822a7f1 100644 --- a/pylib/anki/cards.py +++ b/pylib/anki/cards.py @@ -5,6 +5,7 @@ from __future__ import annotations import pprint import time +from typing import NewType import anki # pylint: disable=unused-import import anki.collection diff --git a/qt/aqt/__init__.py b/qt/aqt/__init__.py index e89848b3b..1d1faad45 100644 --- a/qt/aqt/__init__.py +++ b/qt/aqt/__init__.py @@ -62,6 +62,7 @@ from anki.utils import checksum, is_lin, is_mac from aqt import gui_hooks from aqt.log import setup_logging from aqt.qt import * +from aqt.qt import sip from aqt.utils import TR, tr if TYPE_CHECKING: diff --git a/qt/aqt/addons.py b/qt/aqt/addons.py index a5d1d81c7..c6181ef0a 100644 --- a/qt/aqt/addons.py +++ b/qt/aqt/addons.py @@ -9,6 +9,8 @@ import json import logging import os import re +import sys +import traceback import zipfile from collections import defaultdict from collections.abc import Callable, Iterable, Sequence diff --git a/qt/aqt/browser/find_duplicates.py b/qt/aqt/browser/find_duplicates.py index 33d0c8c9a..60cd11242 100644 --- a/qt/aqt/browser/find_duplicates.py +++ b/qt/aqt/browser/find_duplicates.py @@ -13,6 +13,7 @@ import aqt.forms from anki.collection import SearchNode from anki.notes import NoteId from aqt.qt import * +from aqt.qt import sip from aqt.webview import AnkiWebViewKind from ..operations import QueryOp diff --git a/qt/aqt/browser/sidebar/tree.py b/qt/aqt/browser/sidebar/tree.py index 75fb1a711..b1b5b040b 100644 --- a/qt/aqt/browser/sidebar/tree.py +++ b/qt/aqt/browser/sidebar/tree.py @@ -44,6 +44,7 @@ from aqt.operations.tag import ( set_tag_collapsed, ) from aqt.qt import * +from aqt.qt import sip from aqt.theme import ColoredIcon, theme_manager from aqt.utils import ( KeyboardModifiersPressed, diff --git a/qt/aqt/debug_console.py b/qt/aqt/debug_console.py index 6c8874f38..76fead38b 100644 --- a/qt/aqt/debug_console.py +++ b/qt/aqt/debug_console.py @@ -4,6 +4,7 @@ from __future__ import annotations import os +import sys from collections.abc import Callable from dataclasses import dataclass from functools import partial diff --git a/qt/aqt/deckchooser.py b/qt/aqt/deckchooser.py index 83af93971..72894ed82 100644 --- a/qt/aqt/deckchooser.py +++ b/qt/aqt/deckchooser.py @@ -9,6 +9,7 @@ from anki.collection import OpChanges from anki.decks import DEFAULT_DECK_ID, DeckId from aqt import AnkiQt, gui_hooks from aqt.qt import * +from aqt.qt import sip from aqt.utils import HelpPage, shortcut, tr diff --git a/qt/aqt/errors.py b/qt/aqt/errors.py index b1e729dd9..9ebda65bc 100644 --- a/qt/aqt/errors.py +++ b/qt/aqt/errors.py @@ -3,8 +3,11 @@ from __future__ import annotations +import os import re +import sys import time +import traceback from typing import TYPE_CHECKING, TextIO, cast from markdown import markdown @@ -12,6 +15,7 @@ from markdown import markdown import aqt from anki.collection import HelpPage from anki.errors import BackendError, Interrupted +from anki.utils import is_win from aqt.addons import AddonManager, AddonMeta from aqt.qt import * from aqt.utils import openHelp, showWarning, supportText, tooltip, tr diff --git a/qt/aqt/import_export/importing.py b/qt/aqt/import_export/importing.py index e7174533e..938824035 100644 --- a/qt/aqt/import_export/importing.py +++ b/qt/aqt/import_export/importing.py @@ -3,6 +3,7 @@ from __future__ import annotations +import os import re from abc import ABC, abstractmethod from collections.abc import Callable diff --git a/qt/aqt/importing.py b/qt/aqt/importing.py index 89a4218bf..b00d0b69b 100644 --- a/qt/aqt/importing.py +++ b/qt/aqt/importing.py @@ -4,6 +4,7 @@ from __future__ import annotations import os import re +import sys import traceback import zipfile from collections.abc import Callable diff --git a/qt/aqt/main.py b/qt/aqt/main.py index 2d915b26a..022afd2cd 100644 --- a/qt/aqt/main.py +++ b/qt/aqt/main.py @@ -8,6 +8,8 @@ import gc import os import re import signal +import sys +import traceback import weakref from argparse import Namespace from collections.abc import Callable, Sequence diff --git a/qt/aqt/preferences.py b/qt/aqt/preferences.py index 82ea2ff74..565163158 100644 --- a/qt/aqt/preferences.py +++ b/qt/aqt/preferences.py @@ -12,6 +12,7 @@ import aqt import aqt.forms import aqt.operations from anki.collection import OpChanges +from anki.utils import is_mac from aqt import AnkiQt from aqt.operations.collection import set_preferences from aqt.profiles import VideoDriver diff --git a/qt/aqt/profiles.py b/qt/aqt/profiles.py index 396577260..f70000543 100644 --- a/qt/aqt/profiles.py +++ b/qt/aqt/profiles.py @@ -4,6 +4,7 @@ from __future__ import annotations import io +import os import pickle import random import shutil @@ -23,6 +24,7 @@ from anki.sync import SyncAuth from anki.utils import int_time, int_version, is_mac, is_win from aqt import appHelpSite, gui_hooks from aqt.qt import * +from aqt.qt import sip from aqt.theme import Theme, WidgetStyle, theme_manager from aqt.toolbar import HideMode from aqt.utils import disable_help_button, send_to_trash, showWarning, tr diff --git a/qt/aqt/progress.py b/qt/aqt/progress.py index f4f17fb6c..dd8fb26e1 100644 --- a/qt/aqt/progress.py +++ b/qt/aqt/progress.py @@ -11,6 +11,7 @@ import aqt.forms from anki._legacy import print_deprecation_warning from anki.collection import Progress from aqt.qt import * +from aqt.qt import sip from aqt.utils import disable_help_button, tr # Progress info diff --git a/qt/aqt/reviewer.py b/qt/aqt/reviewer.py index 5058e5177..680d323b1 100644 --- a/qt/aqt/reviewer.py +++ b/qt/aqt/reviewer.py @@ -27,6 +27,7 @@ from anki.scheduler.v3 import ( ) from anki.tags import MARKED_TAG from anki.types import assert_exhaustive +from anki.utils import is_mac from aqt import AnkiQt, gui_hooks from aqt.browser.card_info import PreviousReviewerCardInfo, ReviewerCardInfo from aqt.deckoptions import confirm_deck_then_display_options diff --git a/qt/aqt/sound.py b/qt/aqt/sound.py index 3e582fb69..20b608e10 100644 --- a/qt/aqt/sound.py +++ b/qt/aqt/sound.py @@ -9,6 +9,7 @@ import re import subprocess import sys import time +import traceback import wave from abc import ABC, abstractmethod from collections.abc import Callable diff --git a/qt/aqt/stats.py b/qt/aqt/stats.py index 8116f1b2c..206205349 100644 --- a/qt/aqt/stats.py +++ b/qt/aqt/stats.py @@ -10,6 +10,7 @@ import aqt import aqt.forms import aqt.main from anki.decks import DeckId +from anki.utils import is_mac from aqt import gui_hooks from aqt.operations.deck import set_current_deck from aqt.qt import * diff --git a/qt/aqt/tagedit.py b/qt/aqt/tagedit.py index c88fc1845..5c9686210 100644 --- a/qt/aqt/tagedit.py +++ b/qt/aqt/tagedit.py @@ -9,6 +9,7 @@ from collections.abc import Iterable from anki.collection import Collection from aqt import gui_hooks from aqt.qt import * +from aqt.qt import sip class TagEdit(QLineEdit): diff --git a/qt/aqt/taskman.py b/qt/aqt/taskman.py index 10e3f48af..8e38d0f97 100644 --- a/qt/aqt/taskman.py +++ b/qt/aqt/taskman.py @@ -9,6 +9,7 @@ See QueryOp() and CollectionOp() for higher-level routines. from __future__ import annotations +import traceback from collections.abc import Callable from concurrent.futures import Future from concurrent.futures.thread import ThreadPoolExecutor diff --git a/qt/aqt/webview.py b/qt/aqt/webview.py index 94a9f2e55..890c4dc88 100644 --- a/qt/aqt/webview.py +++ b/qt/aqt/webview.py @@ -5,6 +5,7 @@ from __future__ import annotations import dataclasses import json +import os import re import sys from collections.abc import Callable, Sequence @@ -18,6 +19,7 @@ from anki.lang import is_rtl from anki.utils import hmr_mode, is_lin, is_mac, is_win from aqt import colors, gui_hooks from aqt.qt import * +from aqt.qt import sip from aqt.theme import theme_manager from aqt.utils import askUser, is_gesture_or_zoom_event, openLink, showInfo, tr