From 20432ccecf62f34860c99a24732cf6ba6abba6af Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 31 Aug 2020 12:04:14 +1000 Subject: [PATCH] fix new pylint raise-missing-from lint --- pylib/anki/__init__.py | 5 ++--- pylib/anki/config.py | 4 ++-- pylib/anki/decks.py | 4 ++-- pylib/anki/media.py | 4 ++-- pylib/anki/notes.py | 4 ++-- qt/aqt/mpv.py | 2 ++ qt/aqt/profiles.py | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/pylib/anki/__init__.py b/pylib/anki/__init__.py index dc86258da..d958c513c 100644 --- a/pylib/anki/__init__.py +++ b/pylib/anki/__init__.py @@ -12,8 +12,7 @@ if sys.version_info[0] < 3 or sys.version_info[1] < 7: # ensure unicode filenames are supported try: "ใƒ†ใ‚นใƒˆ".encode(sys.getfilesystemencoding()) -except UnicodeEncodeError: - raise Exception("Anki requires a UTF-8 locale.") - +except UnicodeEncodeError as exc: + raise Exception("Anki requires a UTF-8 locale.") from exc __all__ = ["Collection"] diff --git a/pylib/anki/config.py b/pylib/anki/config.py index 7ae6a98ab..55cfcf585 100644 --- a/pylib/anki/config.py +++ b/pylib/anki/config.py @@ -33,8 +33,8 @@ class ConfigManager: def get_immutable(self, key: str) -> Any: try: return from_json_bytes(self.col.backend.get_config_json(key)) - except NotFoundError: - raise KeyError + except NotFoundError as exc: + raise KeyError from exc def set(self, key: str, val: Any) -> None: self.col.backend.set_config_json(key=key, value_json=to_json_bytes(val)) diff --git a/pylib/anki/decks.py b/pylib/anki/decks.py index 79adf8512..bdcdfde33 100644 --- a/pylib/anki/decks.py +++ b/pylib/anki/decks.py @@ -228,8 +228,8 @@ class DeckManager: g["id"] = self.col.backend.add_or_update_deck_legacy( deck=to_json_bytes(g), preserve_usn_and_mtime=preserve_usn ) - except anki.rsbackend.DeckIsFilteredError: - raise DeckRenameError("deck was filtered") + except anki.rsbackend.DeckIsFilteredError as exc: + raise DeckRenameError("deck was filtered") from exc def rename(self, g: Deck, newName: str) -> None: "Rename deck prefix to NAME if not exists. Updates children." diff --git a/pylib/anki/media.py b/pylib/anki/media.py index cb3399e74..060dc847d 100644 --- a/pylib/anki/media.py +++ b/pylib/anki/media.py @@ -58,8 +58,8 @@ class MediaManager: self._oldcwd = None try: os.chdir(self._dir) - except OSError: - raise Exception("invalidTempFolder") + except OSError as exc: + raise Exception("invalidTempFolder") from exc def __repr__(self) -> str: d = dict(self.__dict__) diff --git a/pylib/anki/notes.py b/pylib/anki/notes.py index 58d6fca44..0871a761f 100644 --- a/pylib/anki/notes.py +++ b/pylib/anki/notes.py @@ -106,8 +106,8 @@ class Note: def _fieldOrd(self, key: str) -> Any: try: return self._fmap[key][0] - except: - raise KeyError(key) + except Exception as exc: + raise KeyError(key) from exc def __getitem__(self, key: str) -> str: return self.fields[self._fieldOrd(key)] diff --git a/qt/aqt/mpv.py b/qt/aqt/mpv.py index 68349eee0..0ae02ecbd 100644 --- a/qt/aqt/mpv.py +++ b/qt/aqt/mpv.py @@ -25,6 +25,8 @@ # # ------------------------------------------------------------------------------ +# pylint: disable=raise-missing-from + import inspect import json import os diff --git a/qt/aqt/profiles.py b/qt/aqt/profiles.py index c46d7d628..08a14d250 100644 --- a/qt/aqt/profiles.py +++ b/qt/aqt/profiles.py @@ -100,8 +100,8 @@ class ProfileManager: sys.exit(1) try: self.load(profile) - except TypeError: - raise Exception("Provided profile does not exist.") + except TypeError as exc: + raise Exception("Provided profile does not exist.") from exc # Base creation ######################################################################