Mercurial Repositories > eric / file diff

--- a/eric6/QScintilla/Lexers/SubstyledLexer.py	Tue Apr 13 18:02:59 2021 +0200
+++ b/eric6/QScintilla/Lexers/SubstyledLexer.py	Tue Apr 13 19:59:17 2021 +0200
@@ -298,31 +298,16 @@
                     col = self.paper(baseStyle)
                     color = col.red() << 16 | col.green() << 8 | col.blue()
                 settings.setValue(substyleKey + "paper", color)
-                if "eolfill" in style:
-                    eolfill = style["eolfill"]
-                else:
-                    eolfill = self.eolFill(baseStyle)
+                eolfill = style.get("eolfill", self.eolFill(baseStyle))
                 settings.setValue(substyleKey + "eolfill", eolfill)
                 font = self.font(baseStyle)
-                if "font_family" in style:
-                    family = style["font_family"]
-                else:
-                    family = font.family()
+                family = style.get("font_family", font.family())
                 settings.setValue(substyleKey + "font_family", family)
-                if "font_size" in style:
-                    size = style["font_size"]
-                else:
-                    size = font.pointSize()
+                size = style.get("font_size", font.pointSize())
                 settings.setValue(substyleKey + "font_size", size)
-                if "font_bold" in style:
-                    bold = style["font_bold"]
-                else:
-                    bold = font.bold()
+                bold = style.get("font_bold", font.bold())
                 settings.setValue(substyleKey + "font_bold", bold)
-                if "font_italic" in style:
-                    italic = style["font_italic"]
-                else:
-                    italic = font.italic()
+                italic = style.get("font_italic", font.italic())
                 settings.setValue(substyleKey + "font_italic", italic)
                 if "font_underline" in style:
                     underline = style["font_underline"]
@@ -357,10 +342,8 @@
         @return number of defined sub-styles
         @rtype int
         """
-        if style in self.__subStyles:
-            count = len(self.__subStyles[style])
-        else:
-            count = 0
+        count = (len(self.__subStyles[style]) if style in self.__subStyles
+                 else 0)
         
         return count