langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add py3.9 to hooks (#1542)

Browse Source 
* Add py3.9 to hooks

This follows examples from efb1ce46d4 I assume the
hooks were missed because those were not considered types but strings.

I did not even try to run pyupgrade and did the change manually, then used bazel format

* remove wildcard import in find.py, and change Any to object (dae)
This commit is contained in:
Arthur Milchior 2021-12-09 00:11:22 +01:00 committed by GitHub
parent 8306bc1e25
commit 69469c6428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pylib/anki/find.py
View File

@ -5,9 +5,8 @@
from __future__ import annotations
from typing import TYPE_CHECKING
from typing import TYPE_CHECKING, Any
from anki.hooks import *
from anki.notes import NoteId
if TYPE_CHECKING:
@ -32,7 +31,7 @@ class Finder:
def findReplace(
col: Collection,
nids: List[NoteId],
nids: list[NoteId],
src: str,
dst: str,
regex: bool = False,
@ -51,7 +50,7 @@ def findReplace(
).count
def fieldNamesForNotes(col: Collection, nids: List[NoteId]) -> List[str]:
def fieldNamesForNotes(col: Collection, nids: list[NoteId]) -> list[str]:
return list(col.field_names_for_note_ids(nids))
@ -59,7 +58,7 @@ def fieldNamesForNotes(col: Collection, nids: List[NoteId]) -> List[str]:
##########################################################################
def fieldNames(col: Collection, downcase: bool = True) -> List:
def fieldNames(col: Collection, downcase: bool = True) -> list[str]:
fields: set[str] = set()
for m in col.models.all():
for f in m["flds"]:

4
pylib/tools/genhooks.py
View File

@ -34,7 +34,7 @@ hooks = [
Hook(name="media_files_did_export", args=["count: int"]),
Hook(
name="exporters_list_created",
args=["exporters: List[Tuple[str, Any]]"],
args=["exporters: list[tuple[str, Any]]"],
legacy_hook="exportersList",
),
Hook(
@ -127,7 +127,7 @@ prefix = """\
from __future__ import annotations
from typing import Any, Callable, List, Sequence, Tuple
from typing import Any, Callable, Sequence
import anki
import anki.hooks
from anki.cards import Card

53
qt/tools/genhooks_gui.py
View File

@ -19,8 +19,7 @@ prefix = """\
from __future__ import annotations
from typing import Any, Callable, Dict, List, Sequence, Tuple, Optional, \
Union, Literal
from typing import Any, Callable, Sequence, Literal
import anki
import aqt
@ -81,11 +80,11 @@ hooks = [
Hook(
name="reviewer_will_init_answer_buttons",
args=[
"buttons_tuple: Tuple[Tuple[int, str], ...]",
"buttons_tuple: tuple[tuple[int, str], ...]",
"reviewer: aqt.reviewer.Reviewer",
"card: Card",
],
return_type="Tuple[Tuple[int, str], ...]",
return_type="tuple[tuple[int, str], ...]",
doc="""Used to modify list of answer buttons
buttons_tuple is a tuple of buttons, with each button represented by a
@ -102,11 +101,11 @@ hooks = [
Hook(
name="reviewer_will_answer_card",
args=[
"ease_tuple: Tuple[bool, Literal[1, 2, 3, 4]]",
"ease_tuple: tuple[bool, Literal[1, 2, 3, 4]]",
"reviewer: aqt.reviewer.Reviewer",
"card: Card",
],
return_type="Tuple[bool, Literal[1, 2, 3, 4]]",
return_type="tuple[bool, Literal[1, 2, 3, 4]]",
doc="""Used to modify the ease at which a card is rated or to bypass
rating the card completely.
@ -137,7 +136,7 @@ hooks = [
),
Hook(
name="reviewer_will_play_question_sounds",
args=["card: Card", "tags: List[anki.sound.AVTag]"],
args=["card: Card", "tags: list[anki.sound.AVTag]"],
doc="""Called before showing the question/front side.
`tags` can be used to inspect and manipulate the sounds
@ -152,7 +151,7 @@ hooks = [
),
Hook(
name="reviewer_will_play_answer_sounds",
args=["card: Card", "tags: List[anki.sound.AVTag]"],
args=["card: Card", "tags: list[anki.sound.AVTag]"],
doc="""Called before showing the answer/back side.
`tags` can be used to inspect and manipulate the sounds
@ -457,7 +456,7 @@ hooks = [
),
Hook(
name="browser_did_fetch_columns",
args=["columns: Dict[str, aqt.browser.Column]"],
args=["columns: dict[str, aqt.browser.Column]"],
doc="""Allows you to add custom columns to the browser.
columns is a dictionary of data obejcts. You can add an entry with a custom
@ -483,7 +482,7 @@ hooks = [
# different sig to original
Hook(
name="state_shortcuts_will_change",
args=["state: str", "shortcuts: List[Tuple[str, Callable]]"],
args=["state: str", "shortcuts: list[tuple[str, Callable]]"],
),
# UI state/refreshing
###################
@ -508,7 +507,7 @@ hooks = [
),
Hook(
name="operation_did_execute",
args=["changes: anki.collection.OpChanges", "handler: Optional[object]"],
args=["changes: anki.collection.OpChanges", "handler: object | None"],
doc="""Called after an operation completes.
Changes can be inspected to determine whether the UI needs updating.
@ -518,8 +517,8 @@ hooks = [
Hook(
name="focus_did_change",
args=[
"new: Optional[QWidget]",
"old: Optional[QWidget]",
"new: QWidget | None",
"old: QWidget | None",
],
doc="""Called each time the focus changes. Can be used to defer updates from
`operation_did_execute` until a window is brought to the front.""",
@ -548,8 +547,8 @@ hooks = [
###################
Hook(
name="webview_did_receive_js_message",
args=["handled: Tuple[bool, Any]", "message: str", "context: Any"],
return_type="Tuple[bool, Any]",
args=["handled: tuple[bool, Any]", "message: str", "context: Any"],
return_type="tuple[bool, Any]",
doc="""Used to handle pycmd() messages sent from Javascript.
Message is the string passed to pycmd().
@ -585,7 +584,7 @@ hooks = [
name="webview_will_set_content",
args=[
"web_content: aqt.webview.WebContent",
"context: Optional[Any]",
"context: object | None",
],
doc="""Used to modify web content before it is rendered.
@ -663,8 +662,8 @@ gui_hooks.webview_did_inject_style_into_page.append(mytest)
name="main_window_should_require_reset",
args=[
"will_reset: bool",
"reason: Union[aqt.main.ResetReason, str]",
"context: Optional[Any]",
"reason: aqt.main.ResetReason | str",
"context: object | None",
],
return_type="bool",
doc="""Executed before the main window will require a reset
@ -704,7 +703,7 @@ gui_hooks.webview_did_inject_style_into_page.append(mytest)
),
Hook(
name="top_toolbar_did_init_links",
args=["links: List[str]", "top_toolbar: aqt.toolbar.Toolbar"],
args=["links: list[str]", "top_toolbar: aqt.toolbar.Toolbar"],
doc="""Used to modify or add links in the top toolbar of Anki's main window
'links' is a list of HTML link elements. Add-ons can generate their own links
@ -769,8 +768,8 @@ gui_hooks.webview_did_inject_style_into_page.append(mytest)
),
Hook(
name="add_cards_will_add_note",
args=["problem: Optional[str]", "note: anki.notes.Note"],
return_type="Optional[str]",
args=["problem: str | None", "note: anki.notes.Note"],
return_type="str | None",
doc="""Decides whether the note should be added to the collection or
not. It is assumed to come from the addCards window.
@ -801,15 +800,15 @@ gui_hooks.webview_did_inject_style_into_page.append(mytest)
###################
Hook(
name="editor_did_init_left_buttons",
args=["buttons: List[str]", "editor: aqt.editor.Editor"],
args=["buttons: list[str]", "editor: aqt.editor.Editor"],
),
Hook(
name="editor_did_init_buttons",
args=["buttons: List[str]", "editor: aqt.editor.Editor"],
args=["buttons: list[str]", "editor: aqt.editor.Editor"],
),
Hook(
name="editor_did_init_shortcuts",
args=["shortcuts: List[Tuple]", "editor: aqt.editor.Editor"],
args=["shortcuts: list[tuple]", "editor: aqt.editor.Editor"],
legacy_hook="setupEditorShortcuts",
),
Hook(
@ -949,7 +948,7 @@ gui_hooks.webview_did_inject_style_into_page.append(mytest)
),
Hook(
name="addons_dialog_will_delete_addons",
args=["dialog: aqt.addons.AddonsDialog", "ids: List[str]"],
args=["dialog: aqt.addons.AddonsDialog", "ids: list[str]"],
doc="""Allows doing an action before an add-on is deleted.""",
),
# Model
@ -961,10 +960,10 @@ gui_hooks.webview_did_inject_style_into_page.append(mytest)
Hook(
name="models_did_init_buttons",
args=[
"buttons: List[Tuple[str, Callable[[], None]]]",
"buttons: list[tuple[str, Callable[[], None]]]",
"models: aqt.models.Models",
],
return_type="List[Tuple[str, Callable[[], None]]]",
return_type="list[tuple[str, Callable[[], None]]]",
doc="""Allows adding buttons to the Model dialog""",
),
# Fields