diff --git a/__init__.py b/__init__.py index 33bd6c0..d21e8f3 100644 --- a/__init__.py +++ b/__init__.py @@ -1,7 +1,7 @@ # Copyright: Ren Tatsumoto # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html -from . import merge_duplicates, merge_notes, settings_dialog, duplicate_notes, find_duplicates +from . import duplicate_notes, find_duplicates, merge_duplicates, merge_notes, settings_dialog merge_notes.init() merge_duplicates.init() diff --git a/config.py b/config.py index 7241f9b..b8fc5df 100644 --- a/config.py +++ b/config.py @@ -2,7 +2,7 @@ # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html import sys -from typing import Callable, Any +from typing import Any, Callable from anki.cards import Card @@ -63,7 +63,7 @@ def names(cls): class Config(AddonConfigManager): _ordering_choices = OrderingChoices() - def __init__(self, default: bool = False): + def __init__(self, default: bool = False) -> None: super().__init__(default) if self["ordering"] not in self._ordering_choices.names(): print(f"Wrong ordering: {self['ordering']}") diff --git a/duplicate_notes.py b/duplicate_notes.py index 0ac051a..c34a44d 100644 --- a/duplicate_notes.py +++ b/duplicate_notes.py @@ -3,7 +3,7 @@ from collections.abc import Sequence -from anki.collection import Collection, OpChanges, AddNoteRequest +from anki.collection import AddNoteRequest, Collection, OpChanges from anki.decks import DeckId from anki.notes import Note from aqt import gui_hooks diff --git a/find_duplicates.py b/find_duplicates.py index 8319a4e..57aea60 100644 --- a/find_duplicates.py +++ b/find_duplicates.py @@ -4,15 +4,14 @@ from collections.abc import Iterable import aqt -from anki.collection import Collection -from anki.collection import SearchNode +from anki.collection import Collection, SearchNode from anki.hooks import wrap from anki.notes import Note, NoteId from aqt.browser import Browser from aqt.browser.find_duplicates import FindDuplicatesDialog from aqt.qt import * -from .config import config, ACTION_NAME +from .config import ACTION_NAME, config from .merge_duplicates import carefully_get_notes from .merge_notes import cfg_strip diff --git a/merge_duplicates.py b/merge_duplicates.py index ab82c56..a5cc0e8 100644 --- a/merge_duplicates.py +++ b/merge_duplicates.py @@ -1,13 +1,13 @@ # Copyright: Ren Tatsumoto # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html -from typing import Optional from collections.abc import Sequence +from typing import Optional import anki.errors -from anki.collection import OpChanges, Collection +from anki.collection import Collection, OpChanges from anki.hooks import wrap -from anki.notes import NoteId, Note +from anki.notes import Note, NoteId from aqt.browser.find_duplicates import FindDuplicatesDialog from aqt.operations import CollectionOp from aqt.qt import * diff --git a/merge_notes.py b/merge_notes.py index 7681848..f91e3d6 100644 --- a/merge_notes.py +++ b/merge_notes.py @@ -4,7 +4,7 @@ import itertools import re import unicodedata -from collections.abc import Sequence, Iterator, Iterable +from collections.abc import Iterable, Iterator, Sequence from typing import Any from anki import collection @@ -18,8 +18,7 @@ from aqt.qt import * from aqt.utils import tooltip -from .config import config, ACTION_NAME - +from .config import ACTION_NAME, config ###################################################################### # Utils diff --git a/settings_dialog.py b/settings_dialog.py index 4a6ed60..cf6cd46 100644 --- a/settings_dialog.py +++ b/settings_dialog.py @@ -4,19 +4,18 @@ import functools from collections.abc import Iterable -from aqt import mw, gui_hooks +from aqt import gui_hooks, mw from aqt.browser import Browser from aqt.qt import * from aqt.utils import restoreGeom, saveGeom -from .ajt_common.widget_placement import place_widgets_in_grid from .ajt_common.about_menu import menu_root_entry, tweak_window from .ajt_common.anki_field_selector import AnkiFieldSelector, gather_all_field_names from .ajt_common.grab_key import ShortCutGrabButton from .ajt_common.monospace_line_edit import MonoSpaceLineEdit from .ajt_common.multiple_choice_selector import MultipleChoiceSelector -from .config import OrderingChoices, Config, config, ACTION_NAME - +from .ajt_common.widget_placement import place_widgets_in_grid +from .config import ACTION_NAME, Config, OrderingChoices, config ###################################################################### # UI Layout