From caf8a75bbce4ba2a4b0b58a8d629bcbe5d480b41 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 19 Oct 2022 12:06:57 +0200 Subject: [PATCH] Fix a couple of issues discovered by pylance --- novelwriter/custom.py | 14 +++++++------- novelwriter/dialogs/docsplit.py | 1 + novelwriter/error.py | 5 +++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/novelwriter/custom.py b/novelwriter/custom.py index 2949ff6a..d516e2dd 100644 --- a/novelwriter/custom.py +++ b/novelwriter/custom.py @@ -267,8 +267,8 @@ class QSwitch(QAbstractButton): return self._offset @offset.setter - def offset(self, theOffset): - self._offset = theOffset + def offset(self, offset): + self._offset = offset self.update() return @@ -276,11 +276,11 @@ class QSwitch(QAbstractButton): # Getters and Setters ## - def setChecked(self, isChecked): + def setChecked(self, checked): """Overload setChecked to also alter the offset. """ - super().setChecked(isChecked) - if isChecked: + super().setChecked(checked) + if checked: self.offset = self._xW - self._xR else: self.offset = self._xR @@ -290,10 +290,10 @@ class QSwitch(QAbstractButton): # Events ## - def resizeEvent(self, theEvent): + def resizeEvent(self, event): """Overload resize to ensure correct offset. """ - super().resizeEvent(theEvent) + super().resizeEvent(event) if self.isChecked(): self.offset = self._xW - self._xR else: diff --git a/novelwriter/dialogs/docsplit.py b/novelwriter/dialogs/docsplit.py index aef72f32..74bdda40 100644 --- a/novelwriter/dialogs/docsplit.py +++ b/novelwriter/dialogs/docsplit.py @@ -201,6 +201,7 @@ class GuiDocSplit(QDialog): onLine = -1 hLevel = 0 + hLabel = aLine.strip() if aLine.startswith("# ") and spLevel >= 1: onLine = lineNo hLevel = 1 diff --git a/novelwriter/error.py b/novelwriter/error.py index ec5d034c..dd0156c8 100644 --- a/novelwriter/error.py +++ b/novelwriter/error.py @@ -44,7 +44,8 @@ def logException(): """Log the content of an exception message. """ exType, exValue, _ = sys.exc_info() - logger.error("%s: %s", exType.__name__, str(exValue)) + if exType is not None: + logger.error("%s: %s", exType.__name__, str(exValue)) def formatException(exc): @@ -131,7 +132,7 @@ class NWErrorMessage(QDialog): try: import lxml - lxmlVersion = lxml.__version__ + lxmlVersion = lxml.__version__ # type: ignore except Exception: lxmlVersion = "Unknown"