diff -r aa713ac50c0d -r cc717c2ae956 eric6/QScintilla/Editor.py
--- a/eric6/QScintilla/Editor.py Thu Apr 15 16:52:05 2021 +0200
+++ b/eric6/QScintilla/Editor.py Thu Apr 15 18:11:24 2021 +0200
@@ -1614,11 +1614,9 @@
"""
Private method to check the selected encoding of the encodings submenu.
"""
- try:
+ with contextlib.suppress(AttributeError, KeyError):
(self.supportedEncodings[self.__normalizedEncoding()]
.setChecked(True))
- except (AttributeError, KeyError):
- pass
def __encodingChanged(self, encoding, propagate=True):
"""
@@ -1671,10 +1669,8 @@
"""
Private method to check the selected eol type of the eol submenu.
"""
- try:
+ with contextlib.suppress(AttributeError, TypeError):
self.supportedEols[self.getLineSeparator()].setChecked(True)
- except (AttributeError, TypeError):
- pass
def __eolChanged(self):
"""
@@ -1711,10 +1707,8 @@
Private slot to check the selected spell check language action.
"""
language = self.getSpellingLanguage()
- try:
+ with contextlib.suppress(AttributeError, KeyError):
self.supportedSpellLanguages[language].setChecked(True)
- except (AttributeError, KeyError):
- pass
def __spellLanguageChanged(self, language, propagate=True):
"""
@@ -4527,10 +4521,8 @@
if Preferences.getEditor("FoldingMargin"):
self.setMarginWidth(self.__foldMargin, 16)
folding = Preferences.getEditor("FoldingStyle")
- try:
+ with contextlib.suppress(AttributeError):
folding = QsciScintilla.FoldStyle(folding)
- except AttributeError:
- pass
self.setFolding(folding, self.__foldMargin)
self.setFoldMarginColors(
Preferences.getEditorColour("FoldmarginBackground"),
@@ -4580,16 +4572,13 @@
if Preferences.getEditor("ShowWhitespace"):
self.setWhitespaceVisibility(
QsciScintilla.WhitespaceVisibility.WsVisible)
- try:
+ with contextlib.suppress(AttributeError):
self.setWhitespaceForegroundColor(
Preferences.getEditorColour("WhitespaceForeground"))
self.setWhitespaceBackgroundColor(
Preferences.getEditorColour("WhitespaceBackground"))
self.setWhitespaceSize(
Preferences.getEditor("WhitespaceSize"))
- except AttributeError:
- # QScintilla before 2.5 doesn't support this
- pass
else:
self.setWhitespaceVisibility(
QsciScintilla.WhitespaceVisibility.WsInvisible)
@@ -4675,15 +4664,13 @@
self.setCursorFlashTime(QApplication.cursorFlashTime())
- try:
+ with contextlib.suppress(AttributeError):
if Preferences.getEditor("AnnotationsEnabled"):
self.setAnnotationDisplay(
QsciScintilla.AnnotationDisplay.AnnotationBoxed)
else:
self.setAnnotationDisplay(
QsciScintilla.AnnotationDisplay.AnnotationHidden)
- except AttributeError:
- pass
self.__setAnnotationStyles()
if Preferences.getEditor("OverrideEditAreaColours"):
@@ -4768,11 +4755,9 @@
Preferences.getEditorColour("CallTipsHighlight"))
self.setCallTipsVisible(Preferences.getEditor("CallTipsVisible"))
calltipsStyle = Preferences.getEditor("CallTipsStyle")
- try:
+ with contextlib.suppress(AttributeError):
self.setCallTipsPosition(
Preferences.getEditor("CallTipsPosition"))
- except AttributeError:
- pass
if Preferences.getEditor("CallTipsEnabled"):
if calltipsStyle == QsciScintilla.CallTipsStyle.CallTipsNoContext:
@@ -7000,11 +6985,9 @@
if self.spell:
self.spell.stopIncrementalCheck()
- try:
+ with contextlib.suppress(TypeError):
self.project.projectPropertiesChanged.disconnect(
self.__projectPropertiesChanged)
- except TypeError:
- pass
if self.fileName:
self.taskViewer.clearFileTasks(self.fileName, True)
@@ -7071,10 +7054,8 @@
self.vm.copyActGrp.setEnabled(True)
self.vm.viewActGrp.setEnabled(True)
self.vm.searchActGrp.setEnabled(True)
- try:
+ with contextlib.suppress(AttributeError):
self.setCaretWidth(self.caretWidth)
- except AttributeError:
- pass
self.__updateReadOnly(False)
if (
self.vm.editorsCheckFocusInEnabled() and
@@ -7258,12 +7239,8 @@
@return flag indiating that the event was handled
@rtype bool
"""
- try:
+ with contextlib.suppress(AttributeError):
self.__markerMap.calculateGeometry()
- except AttributeError:
- # ignore this - there seems to be a runtime issue when the editor
- # is created
- pass
return super().viewportEvent(evt)
def __updateReadOnly(self, bForce=True):
@@ -7780,11 +7757,9 @@
"""
Public slot to handle the closing of a project.
"""
- try:
+ with contextlib.suppress(TypeError):
self.project.projectPropertiesChanged.disconnect(
self.__projectPropertiesChanged)
- except TypeError:
- pass
#######################################################################
## Spell checking related methods
@@ -7852,17 +7827,13 @@
Public method to set the automatic spell checking.
"""
if Preferences.getEditor("AutoSpellCheckingEnabled"):
- try:
+ with contextlib.suppress(TypeError):
self.SCN_CHARADDED.connect(
self.__spellCharAdded, Qt.ConnectionType.UniqueConnection)
- except TypeError:
- pass
self.spell.checkDocumentIncrementally()
else:
- try:
+ with contextlib.suppress(TypeError):
self.SCN_CHARADDED.disconnect(self.__spellCharAdded)
- except TypeError:
- pass
self.clearAllIndicators(self.spellingIndicator)
def isSpellCheckRegion(self, pos):
