From b30b7c3073d7f314aed30ef448260734aab5a41e Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Thu, 7 Jan 2021 16:20:02 +1000 Subject: [PATCH] fix qt/ pylints --- pylib/tools/genhooks.py | 2 ++ qt/.pylintrc | 4 ++-- qt/aqt/browser.py | 10 +++++++--- qt/aqt/deckbrowser.py | 3 +-- qt/aqt/editor.py | 2 +- qt/aqt/gui_hooks.py | 2 -- qt/aqt/profiles.py | 2 -- qt/aqt/sidebar.py | 1 - qt/aqt/sound.py | 10 ++-------- qt/tests/run_pylint.py | 4 ++-- 10 files changed, 17 insertions(+), 23 deletions(-) diff --git a/pylib/tools/genhooks.py b/pylib/tools/genhooks.py index 575c41e25..2997c0af2 100644 --- a/pylib/tools/genhooks.py +++ b/pylib/tools/genhooks.py @@ -113,6 +113,8 @@ prefix = """\ # This file is automatically generated; edit tools/genhooks.py instead. # Please import from anki.hooks instead of this file. +# pylint: disable=unused-import + from __future__ import annotations from typing import Any, Callable, List, Sequence, Tuple diff --git a/qt/.pylintrc b/qt/.pylintrc index 92771b05b..91dfd57e0 100644 --- a/qt/.pylintrc +++ b/qt/.pylintrc @@ -1,10 +1,10 @@ [MASTER] persistent = no extension-pkg-whitelist=PyQt5 -ignore = forms +ignore = forms,hooks_gen.py [TYPECHECK] -ignored-modules=win32file,pywintypes,socket,win32pipe +ignored-modules=win32file,pywintypes,socket,win32pipe,winrt [REPORTS] output-format=colorized diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py index 4bab317de..ead439982 100644 --- a/qt/aqt/browser.py +++ b/qt/aqt/browser.py @@ -21,7 +21,7 @@ from anki.consts import * from anki.lang import without_unicode_isolation from anki.models import NoteType from anki.notes import Note -from anki.rsbackend import TR, DeckTreeNode, InvalidInput, pb +from anki.rsbackend import DeckTreeNode, InvalidInput, pb from anki.stats import CardStats from anki.utils import htmlToTextLine, ids2str, isMac, isWin from aqt import AnkiQt, gui_hooks @@ -1235,11 +1235,15 @@ QTableView {{ gridline-color: {grid} }} ) elif mods & Qt.ControlModifier: txt = self.col.backend.concatenate_searches( - sep=pb.ConcatenateSearchesIn.Separator.AND, searches=[cur, txt] + # pylint: disable=no-member + sep=pb.ConcatenateSearchesIn.Separator.AND, + searches=[cur, txt], ) elif mods & Qt.ShiftModifier: txt = self.col.backend.concatenate_searches( - sep=pb.ConcatenateSearchesIn.Separator.OR, searches=[cur, txt] + # pylint: disable=no-member + sep=pb.ConcatenateSearchesIn.Separator.OR, + searches=[cur, txt], ) except InvalidInput as e: showWarning(str(e)) diff --git a/qt/aqt/deckbrowser.py b/qt/aqt/deckbrowser.py index 87b1cec85..a3641fd95 100644 --- a/qt/aqt/deckbrowser.py +++ b/qt/aqt/deckbrowser.py @@ -9,8 +9,7 @@ from dataclasses import dataclass import aqt from anki.errors import DeckRenameError -from anki.rsbackend import TR, DeckTreeNode -from anki.utils import ids2str +from anki.rsbackend import DeckTreeNode from aqt import AnkiQt, gui_hooks from aqt.qt import * from aqt.sound import av_player diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py index cf360b43d..64c3ebbde 100644 --- a/qt/aqt/editor.py +++ b/qt/aqt/editor.py @@ -23,7 +23,7 @@ from anki.cards import Card from anki.hooks import runFilter from anki.httpclient import HttpClient from anki.notes import Note -from anki.utils import checksum, isLin, isWin, namedtmp, stripHTMLMedia +from anki.utils import checksum, isLin, isWin, namedtmp from aqt import AnkiQt, gui_hooks from aqt.main import ResetReason from aqt.qt import * diff --git a/qt/aqt/gui_hooks.py b/qt/aqt/gui_hooks.py index 3a79841c0..6c59aadc7 100644 --- a/qt/aqt/gui_hooks.py +++ b/qt/aqt/gui_hooks.py @@ -7,7 +7,5 @@ See pylib/anki/hooks.py from __future__ import annotations -from typing import Any, Callable, List, Optional, Tuple, Union - # You can find the definitions in ../tools/genhooks_gui.py from aqt.hooks_gen import * diff --git a/qt/aqt/profiles.py b/qt/aqt/profiles.py index d671a6aa1..93065846d 100644 --- a/qt/aqt/profiles.py +++ b/qt/aqt/profiles.py @@ -3,9 +3,7 @@ from __future__ import annotations -import enum import io -import locale import pickle import random import shutil diff --git a/qt/aqt/sidebar.py b/qt/aqt/sidebar.py index f61770ae9..4103a44df 100644 --- a/qt/aqt/sidebar.py +++ b/qt/aqt/sidebar.py @@ -3,7 +3,6 @@ # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html from __future__ import annotations -import re from concurrent.futures import Future from enum import Enum diff --git a/qt/aqt/sound.py b/qt/aqt/sound.py index c0962db3f..a9cd6d4f9 100644 --- a/qt/aqt/sound.py +++ b/qt/aqt/sound.py @@ -526,7 +526,6 @@ class Recorder(ABC): def on_timer(self): "Will be called periodically." - pass # QAudioInput recording @@ -540,12 +539,7 @@ class QtAudioInputRecorder(Recorder): self.mw = mw self._parent = parent - from PyQt5.QtMultimedia import ( - QAudio, - QAudioDeviceInfo, - QAudioFormat, - QAudioInput, - ) + from PyQt5.QtMultimedia import QAudioDeviceInfo, QAudioFormat, QAudioInput format = QAudioFormat() format.setChannelCount(1) @@ -776,7 +770,7 @@ class RecordDialog(QDialog): try: self._save_diag() - self._recorder.stop(lambda out: self._on_success(out)) + self._recorder.stop(self._on_success) finally: QDialog.accept(self) diff --git a/qt/tests/run_pylint.py b/qt/tests/run_pylint.py index 6c2ec81ec..bec5b8cae 100644 --- a/qt/tests/run_pylint.py +++ b/qt/tests/run_pylint.py @@ -1,9 +1,9 @@ +import multiprocessing import os import subprocess import sys -import PyQt5 -import multiprocessing +import PyQt5 from pylint.lint import Run if __name__ == "__main__":