Mercurial Repositories > eric / file diff

--- a/eric6/QScintilla/QsciScintillaCompat.py	Thu Apr 15 16:52:05 2021 +0200
+++ b/eric6/QScintilla/QsciScintillaCompat.py	Thu Apr 15 18:11:24 2021 +0200
@@ -7,6 +7,8 @@
 Module implementing a compatability interface class to QsciScintilla.
 """
 
+import contextlib
+
 from PyQt5.QtCore import pyqtSignal, Qt, QPoint
 from PyQt5.QtGui import QPalette, QColor, QFontMetrics
 from PyQt5.QtWidgets import QApplication, QListWidget
@@ -759,11 +761,9 @@
         @param alwaysVisible flag indicating that the caret line shall be
             visible even if the editor doesn't have the focus (boolean)
         """
-        try:
+        with contextlib.suppress(AttributeError):
             self.SendScintilla(
                 QsciScintilla.SCI_SETCARETLINEVISIBLEALWAYS, alwaysVisible)
-        except AttributeError:
-            pass
     
     def canPaste(self):
         """
@@ -910,12 +910,10 @@
             self.__targetSearchFlags |= QsciScintilla.SCFIND_WORDSTART
         if posix:
             self.__targetSearchFlags |= QsciScintilla.SCFIND_POSIX
-        try:
+        with contextlib.suppress(AttributeError):
             if cxx11:
                 self.__targetSearchFlags |= QsciScintilla.SCFIND_CXX11REGEX
-        except AttributeError:
             # defined for QScintilla >= 2.11.0
-            pass
         
         if begline < 0 or begindex < 0:
             self.__targetSearchStart = self.SendScintilla(
@@ -1012,7 +1010,7 @@
         
         self.SendScintilla(QsciScintilla.SCI_INDICSETSTYLE, indicator, style)
         self.SendScintilla(QsciScintilla.SCI_INDICSETFORE, indicator, color)
-        try:
+        with contextlib.suppress(AttributeError):
             self.SendScintilla(QsciScintilla.SCI_INDICSETALPHA, indicator,
                                color.alpha())
             if style in (
@@ -1022,8 +1020,6 @@
                 # set outline alpha less transparent
                 self.SendScintilla(QsciScintilla.SCI_INDICSETOUTLINEALPHA,
                                    indicator, color.alpha() + 20)
-        except AttributeError:
-            pass
     
     def setCurrentIndicator(self, indicator):
         """