Mercurial Repositories > eric / file diff

--- a/eric6/DocumentationTools/ModuleDocumentor.py	Tue Apr 20 19:38:10 2021 +0200
+++ b/eric6/DocumentationTools/ModuleDocumentor.py	Tue Apr 20 19:47:39 2021 +0200
@@ -304,10 +304,11 @@
             
         classesSection = self.__genClassesSection()
         functionsSection = self.__genFunctionsSection()
-        if self.module.type == RB_SOURCE:
-            rbModulesSection = self.__genRbModulesSection()
-        else:
-            rbModulesSection = ""
+        rbModulesSection = (
+            self.__genRbModulesSection()
+            if self.module.type == RB_SOURCE else
+            ""
+        )
         return "{0}{1}{2}{3}".format(
             modBody, classesSection, rbModulesSection, functionsSection)
         
@@ -349,12 +350,13 @@
         scope = class_ if class_ is not None else self.module
         attrNames = sorted(attr for attr in scope.globals.keys()
                            if not scope.globals[attr].isSignal)
-        if attrNames:
-            s = ''.join(
+        s = (
+            ''.join(
                 [self.listEntrySimpleTemplate.format(**{'Name': name})
                  for name in attrNames])
-        else:
-            s = self.listEntryNoneTemplate
+            if attrNames else
+            self.listEntryNoneTemplate
+        )
         return self.listTemplate.format(**{'Entries': s})
         
     def __genClassListSection(self):
@@ -1157,82 +1159,94 @@
         
         description = self.__genParagraphs(paragraphs) if paragraphs else ""
         
-        if paramList:
-            parameterSect = self.parametersListTemplate.format(
+        parameterSect = (
+            self.parametersListTemplate.format(
                 **{'Parameters': self.__genParamDescriptionListSection(
                     paramList)})
-        else:
-            parameterSect = ""
+            if paramList else
+            ""
+        )
         
-        if returns:
-            returnSect = self.returnsTemplate.format(
+        returnSect = (
+            self.returnsTemplate.format(
                 html_uencode('\n'.join(returns)))
-        else:
-            returnSect = ""
-        
-        if returnTypes:
-            returnTypesSect = self.returnTypesTemplate.format(
-                html_uencode('\n'.join(returnTypes)))
-        else:
-            returnTypesSect = ""
+            if returns else
+            ""
+        )
         
-        if yields:
-            yieldSect = self.yieldsTemplate.format(
-                html_uencode('\n'.join(yields)))
-        else:
-            yieldSect = ""
+        returnTypesSect = (
+            self.returnTypesTemplate.format(
+                html_uencode('\n'.join(returnTypes)))
+            if returnTypes else
+            ""
+        )
         
-        if yieldTypes:
-            yieldTypesSect = self.yieldTypesTemplate.format(
+        yieldSect = (
+            self.yieldsTemplate.format(
+                html_uencode('\n'.join(yields)))
+            if yields else
+            ""
+        )
+        
+        yieldTypesSect = (
+            self.yieldTypesTemplate.format(
                 html_uencode('\n'.join(yieldTypes)))
-        else:
-            yieldTypesSect = ""
+            if yieldTypes else
+            ""
+        )
         
-        if exceptionDict:
-            exceptionSect = self.exceptionsListTemplate.format(
+        exceptionSect = (
+            self.exceptionsListTemplate.format(
                 **{'Exceptions': self.__genDescriptionListSection(
                     exceptionDict, self.exceptionsListEntryTemplate)})
-        else:
-            exceptionSect = ""
+            if exceptionDict else
+            ""
+        )
         
-        if signalDict:
-            signalSect = self.signalsListTemplate.format(
+        signalSect = (
+            self.signalsListTemplate.format(
                 **{'Signals': self.__genDescriptionListSection(
                     signalDict, self.signalsListEntryTemplate)})
-        else:
-            signalSect = ""
+            if signalDict else
+            ""
+        )
         
-        if eventDict:
-            eventSect = self.eventsListTemplate.format(
+        eventSect = (
+            self.eventsListTemplate.format(
                 **{'Events': self.__genDescriptionListSection(
                     eventDict, self.eventsListEntryTemplate)})
-        else:
-            eventSect = ""
+            if eventDict else
+            ""
+        )
         
-        if deprecated:
-            deprecatedSect = self.deprecatedTemplate.format(
+        deprecatedSect = (
+            self.deprecatedTemplate.format(
                 **{'Lines': html_uencode('\n'.join(deprecated))})
-        else:
-            deprecatedSect = ""
+            if deprecated else
+            ""
+        )
         
-        if authorInfo:
-            authorInfoSect = self.authorInfoTemplate.format(
+        authorInfoSect = (
+            self.authorInfoTemplate.format(
                 **{'Authors': html_uencode('\n'.join(authorInfo))})
-        else:
-            authorInfoSect = ""
+            if authorInfo else
+            ""
+        )
         
-        if sinceInfo:
-            sinceInfoSect = self.sinceInfoTemplate.format(
+        sinceInfoSect = (
+            self.sinceInfoTemplate.format(
                 **{'Info': html_uencode(sinceInfo[0])})
-        else:
-            sinceInfoSect = ""
+            if sinceInfo else
+            ""
+        )
         
-        if seeList:
-            seeSect = self.seeListTemplate.format(
+        seeSect = (
+            self.seeListTemplate.format(
                 **{'Links': self.__genSeeListSection(
                     seeList, self.seeListEntryTemplate)})
-        else:
-            seeSect = ''
+            if seeList else
+            ''
+        )
         
         return "".join([
             deprecatedSect, description, parameterSect, returnSect,