Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/PreferencesLexer.py	Wed Apr 21 17:56:12 2021 +0200
+++ b/eric6/Preferences/PreferencesLexer.py	Wed Apr 21 19:40:50 2021 +0200
@@ -158,10 +158,11 @@
         @return default color
         @rtype QColor
         """
-        if substyle >= 0:
-            color = self.__lex.substyleDefaultColor(style, substyle)
-        else:
-            color = self.__lex.defaultColor(style)
+        color = (
+            self.__lex.substyleDefaultColor(style, substyle)
+            if substyle >= 0 else
+            self.__lex.defaultColor(style)
+        )
         
         return color
     
@@ -176,10 +177,11 @@
         @return color
         @rtype QColor
         """
-        if substyle >= 0:
-            color = self.__lex.substyleColor(style, substyle)
-        else:
-            color = self.__lex.color(style)
+        color = (
+            self.__lex.substyleColor(style, substyle)
+            if substyle >= 0 else
+            self.__lex.color(style)
+        )
         
         return color
     
@@ -210,10 +212,11 @@
         @return default background color
         @rtype QColor
         """
-        if substyle >= 0:
-            color = self.__lex.substyleDefaultPaper(style, substyle)
-        else:
-            color = self.__lex.defaultPaper(style)
+        color = (
+            self.__lex.substyleDefaultPaper(style, substyle)
+            if substyle >= 0 else
+            self.__lex.defaultPaper(style)
+        )
         
         return color
     
@@ -228,10 +231,11 @@
         @return background color
         @rtype QColor
         """
-        if substyle >= 0:
-            color = self.__lex.substylePaper(style, substyle)
-        else:
-            color = self.__lex.paper(style)
+        color = (
+            self.__lex.substylePaper(style, substyle)
+            if substyle >= 0 else
+            self.__lex.paper(style)
+        )
         
         return color
     
@@ -262,10 +266,11 @@
         @return default eolFill flag
         @rtype bool
         """
-        if substyle >= 0:
-            eolFill = self.__lex.substyleDefaultEolFill(style, substyle)
-        else:
-            eolFill = self.__lex.defaultEolFill(style)
+        eolFill = (
+            self.__lex.substyleDefaultEolFill(style, substyle)
+            if substyle >= 0 else
+            self.__lex.defaultEolFill(style)
+        )
         
         return eolFill
     
@@ -280,10 +285,11 @@
         @return eolFill flag
         @rtype bool
         """
-        if substyle >= 0:
-            eolFill = self.__lex.substyleEolFill(style, substyle)
-        else:
-            eolFill = self.__lex.eolFill(style)
+        eolFill = (
+            self.__lex.substyleEolFill(style, substyle)
+            if substyle >= 0 else
+            self.__lex.eolFill(style)
+        )
         
         return eolFill
     
@@ -314,10 +320,11 @@
         @return default font
         @rtype QFont
         """
-        if substyle >= 0:
-            font = self.__lex.substyleDefaultFont(style, substyle)
-        else:
-            font = self.__lex.defaultFont(style)
+        font = (
+            self.__lex.substyleDefaultFont(style, substyle)
+            if substyle >= 0 else
+            self.__lex.defaultFont(style)
+        )
         
         return font
     
@@ -332,10 +339,11 @@
         @return font
         @rtype QFont
         """
-        if substyle >= 0:
-            font = self.__lex.substyleFont(style, substyle)
-        else:
-            font = self.__lex.font(style)
+        font = (
+            self.__lex.substyleFont(style, substyle)
+            if substyle >= 0 else
+            self.__lex.font(style)
+        )
         
         return font
     
@@ -366,10 +374,11 @@
         @return whitespace separated default list of words
         @rtype str
         """
-        if substyle >= 0:
-            words = self.__lex.substyleDefaultWords(style, substyle)
-        else:
-            words = ""
+        words = (
+            self.__lex.substyleDefaultWords(style, substyle)
+            if substyle >= 0 else
+            ""
+        )
         
         return words
     
@@ -415,11 +424,12 @@
         @return default description of the style
         @rtype str
         """
-        if substyle >= 0:
-            desc = self.__lex.substyleDefaultDescription(style, substyle)
-        else:
+        desc = (
+            self.__lex.substyleDefaultDescription(style, substyle)
+            if substyle >= 0 else
             # for base styles return the hard coded description
-            desc = self.__lex.description(style)
+            self.__lex.description(style)
+        )
         
         return desc
     
@@ -434,10 +444,11 @@
         @return description of the style
         @rtype str
         """
-        if substyle >= 0:
-            desc = self.__lex.substyleDescription(style, substyle)
-        else:
-            desc = self.__lex.description(style)
+        desc = (
+            self.__lex.substyleDescription(style, substyle)
+            if substyle >= 0 else
+            self.__lex.description(style)
+        )
         
         return desc