diff -r 6fa22aa4fc4a -r 8b5c6896655b eric6/DocumentationTools/ModuleDocumentor.py --- a/eric6/DocumentationTools/ModuleDocumentor.py Mon Apr 12 19:25:18 2021 +0200 +++ b/eric6/DocumentationTools/ModuleDocumentor.py Mon Apr 12 19:54:29 2021 +0200 @@ -331,10 +331,8 @@ self.__checkDeprecated(sectionDict[name].description) and self.listEntryDeprecatedTemplate or "", })) - if kwSuffix: - n = "{0} ({1})".format(name, kwSuffix) - else: - n = "{0}".format(name) + n = ("{0} ({1})".format(name, kwSuffix) if kwSuffix + else "{0}".format(name)) self.keywords.append((n, "#{0}".format(name))) return ''.join(lst) @@ -347,10 +345,7 @@ @return The globals list section. (string) """ attrNames = [] - if class_ is not None: - scope = class_ - else: - scope = self.module + 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: @@ -418,10 +413,7 @@ for className in classNames: _class = self.module.classes[className] supers = _class.super - if len(supers) > 0: - supers = ', '.join(supers) - else: - supers = 'None' + supers = ', '.join(supers) if len(supers) > 0 else "None" globalsList = self.__genGlobalsListSection(_class) classMethList, classMethBodies = self.__genMethodSection( @@ -633,10 +625,7 @@ for className in classNames: _class = obj.classes[className] supers = _class.super - if len(supers) > 0: - supers = ', '.join(supers) - else: - supers = 'None' + supers = ', '.join(supers) if len(supers) > 0 else "None" methList, methBodies = self.__genMethodSection( _class, className, Function.General) @@ -1167,10 +1156,7 @@ elif not inTagSection: lastItem.append(ditem) - if paragraphs: - description = self.__genParagraphs(paragraphs) - else: - description = "" + description = self.__genParagraphs(paragraphs) if paragraphs else "" if paramList: parameterSect = self.parametersListTemplate.format(