Sat, 21 Sep 2019 15:37:43 +0200
Continued to resolve code style issue M841.
--- a/eric6/DocumentationTools/IndexGenerator.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/DocumentationTools/IndexGenerator.py Sat Sep 21 15:37:43 2019 +0200 @@ -46,26 +46,26 @@ self.headerTemplate = TemplatesListsStyleCSS.headerTemplate self.footerTemplate = TemplatesListsStyleCSS.footerTemplate self.indexBodyTemplate = TemplatesListsStyleCSS.indexBodyTemplate - self.indexListPackagesTemplate = \ - TemplatesListsStyleCSS.indexListPackagesTemplate - self.indexListModulesTemplate = \ - TemplatesListsStyleCSS.indexListModulesTemplate - self.indexListEntryTemplate = \ - TemplatesListsStyleCSS.indexListEntryTemplate + self.indexListPackagesTemplate = ( + TemplatesListsStyleCSS.indexListPackagesTemplate) + self.indexListModulesTemplate = ( + TemplatesListsStyleCSS.indexListModulesTemplate) + self.indexListEntryTemplate = ( + TemplatesListsStyleCSS.indexListEntryTemplate) else: from . import TemplatesListsStyle - self.headerTemplate = \ - TemplatesListsStyle.headerTemplate.format(**colors) - self.footerTemplate = \ - TemplatesListsStyle.footerTemplate.format(**colors) - self.indexBodyTemplate = \ - TemplatesListsStyle.indexBodyTemplate.format(**colors) - self.indexListPackagesTemplate = \ - TemplatesListsStyle.indexListPackagesTemplate.format(**colors) - self.indexListModulesTemplate = \ - TemplatesListsStyle.indexListModulesTemplate.format(**colors) - self.indexListEntryTemplate = \ - TemplatesListsStyle.indexListEntryTemplate.format(**colors) + self.headerTemplate = ( + TemplatesListsStyle.headerTemplate.format(**colors)) + self.footerTemplate = ( + TemplatesListsStyle.footerTemplate.format(**colors)) + self.indexBodyTemplate = ( + TemplatesListsStyle.indexBodyTemplate.format(**colors)) + self.indexListPackagesTemplate = ( + TemplatesListsStyle.indexListPackagesTemplate.format(**colors)) + self.indexListModulesTemplate = ( + TemplatesListsStyle.indexListModulesTemplate.format(**colors)) + self.indexListEntryTemplate = ( + TemplatesListsStyle.indexListEntryTemplate.format(**colors)) def remember(self, file, moduleDocument, basename=""): """ @@ -110,8 +110,8 @@ elt = self.packages[package] except KeyError: elt = self.packages["00index"] - elt["modules"][moduleDocument.name()] = \ - moduleDocument.shortDescription() + elt["modules"][moduleDocument.name()] = ( + moduleDocument.shortDescription()) def __writeIndex(self, packagename, package, newline=None): """ @@ -169,15 +169,17 @@ "Entries": "".join(lst), }) - doc = self.headerTemplate.format( - **{"Title": title, - "Style": self.stylesheet}) + \ - self.indexBodyTemplate.format( + doc = ( + self.headerTemplate.format( + **{"Title": title, + "Style": self.stylesheet} + ) + self.indexBodyTemplate.format( **{"Title": title, "Description": package["description"], "Subpackages": subpackages, - "Modules": modules}) + \ - self.footerTemplate + "Modules": modules} + ) + self.footerTemplate + ) f = open(filename, "w", encoding="utf-8", newline=newline) f.write(doc)
--- a/eric6/DocumentationTools/ModuleDocumentor.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/DocumentationTools/ModuleDocumentor.py Sat Sep 21 15:37:43 2019 +0200 @@ -82,120 +82,120 @@ self.rbFileTemplate = TemplatesListsStyleCSS.rbFileTemplate self.classTemplate = TemplatesListsStyleCSS.classTemplate self.methodTemplate = TemplatesListsStyleCSS.methodTemplate - self.constructorTemplate = \ - TemplatesListsStyleCSS.constructorTemplate + self.constructorTemplate = ( + TemplatesListsStyleCSS.constructorTemplate) self.rbModuleTemplate = TemplatesListsStyleCSS.rbModuleTemplate - self.rbModulesClassTemplate = \ - TemplatesListsStyleCSS.rbModulesClassTemplate + self.rbModulesClassTemplate = ( + TemplatesListsStyleCSS.rbModulesClassTemplate) self.functionTemplate = TemplatesListsStyleCSS.functionTemplate self.listTemplate = TemplatesListsStyleCSS.listTemplate self.listEntryTemplate = TemplatesListsStyleCSS.listEntryTemplate - self.listEntryNoneTemplate = \ - TemplatesListsStyleCSS.listEntryNoneTemplate - self.listEntryDeprecatedTemplate = \ - TemplatesListsStyleCSS.listEntryDeprecatedTemplate - self.listEntrySimpleTemplate = \ - TemplatesListsStyleCSS.listEntrySimpleTemplate + self.listEntryNoneTemplate = ( + TemplatesListsStyleCSS.listEntryNoneTemplate) + self.listEntryDeprecatedTemplate = ( + TemplatesListsStyleCSS.listEntryDeprecatedTemplate) + self.listEntrySimpleTemplate = ( + TemplatesListsStyleCSS.listEntrySimpleTemplate) self.paragraphTemplate = TemplatesListsStyleCSS.paragraphTemplate - self.parametersListTemplate = \ - TemplatesListsStyleCSS.parametersListTemplate - self.parameterTypesListEntryTemplate = \ - TemplatesListsStyleCSS.parameterTypesListEntryTemplate - self.parametersListEntryTemplate = \ - TemplatesListsStyleCSS.parametersListEntryTemplate + self.parametersListTemplate = ( + TemplatesListsStyleCSS.parametersListTemplate) + self.parameterTypesListEntryTemplate = ( + TemplatesListsStyleCSS.parameterTypesListEntryTemplate) + self.parametersListEntryTemplate = ( + TemplatesListsStyleCSS.parametersListEntryTemplate) self.returnsTemplate = TemplatesListsStyleCSS.returnsTemplate - self.returnTypesTemplate = \ - TemplatesListsStyleCSS.returnTypesTemplate - self.exceptionsListTemplate = \ - TemplatesListsStyleCSS.exceptionsListTemplate - self.exceptionsListEntryTemplate = \ - TemplatesListsStyleCSS.exceptionsListEntryTemplate - self.signalsListTemplate = \ - TemplatesListsStyleCSS.signalsListTemplate - self.signalsListEntryTemplate = \ - TemplatesListsStyleCSS.signalsListEntryTemplate + self.returnTypesTemplate = ( + TemplatesListsStyleCSS.returnTypesTemplate) + self.exceptionsListTemplate = ( + TemplatesListsStyleCSS.exceptionsListTemplate) + self.exceptionsListEntryTemplate = ( + TemplatesListsStyleCSS.exceptionsListEntryTemplate) + self.signalsListTemplate = ( + TemplatesListsStyleCSS.signalsListTemplate) + self.signalsListEntryTemplate = ( + TemplatesListsStyleCSS.signalsListEntryTemplate) self.eventsListTemplate = TemplatesListsStyleCSS.eventsListTemplate - self.eventsListEntryTemplate = \ - TemplatesListsStyleCSS.eventsListEntryTemplate + self.eventsListEntryTemplate = ( + TemplatesListsStyleCSS.eventsListEntryTemplate) self.deprecatedTemplate = TemplatesListsStyleCSS.deprecatedTemplate self.authorInfoTemplate = TemplatesListsStyleCSS.authorInfoTemplate self.seeListTemplate = TemplatesListsStyleCSS.seeListTemplate - self.seeListEntryTemplate = \ - TemplatesListsStyleCSS.seeListEntryTemplate + self.seeListEntryTemplate = ( + TemplatesListsStyleCSS.seeListEntryTemplate) self.seeLinkTemplate = TemplatesListsStyleCSS.seeLinkTemplate self.sinceInfoTemplate = TemplatesListsStyleCSS.sinceInfoTemplate else: from . import TemplatesListsStyle - self.headerTemplate = \ - TemplatesListsStyle.headerTemplate.format(**colors) - self.footerTemplate = \ - TemplatesListsStyle.footerTemplate.format(**colors) - self.moduleTemplate = \ - TemplatesListsStyle.moduleTemplate.format(**colors) - self.rbFileTemplate = \ - TemplatesListsStyle.rbFileTemplate.format(**colors) - self.classTemplate = \ - TemplatesListsStyle.classTemplate.format(**colors) - self.methodTemplate = \ - TemplatesListsStyle.methodTemplate.format(**colors) - self.constructorTemplate = \ - TemplatesListsStyle.constructorTemplate.format(**colors) - self.rbModuleTemplate = \ - TemplatesListsStyle.rbModuleTemplate.format(**colors) - self.rbModulesClassTemplate = \ - TemplatesListsStyle.rbModulesClassTemplate.format(**colors) - self.functionTemplate = \ - TemplatesListsStyle.functionTemplate.format(**colors) - self.listTemplate = \ - TemplatesListsStyle.listTemplate.format(**colors) - self.listEntryTemplate = \ - TemplatesListsStyle.listEntryTemplate.format(**colors) - self.listEntryNoneTemplate = \ - TemplatesListsStyle.listEntryNoneTemplate.format(**colors) - self.listEntryDeprecatedTemplate = \ + self.headerTemplate = ( + TemplatesListsStyle.headerTemplate.format(**colors)) + self.footerTemplate = ( + TemplatesListsStyle.footerTemplate.format(**colors)) + self.moduleTemplate = ( + TemplatesListsStyle.moduleTemplate.format(**colors)) + self.rbFileTemplate = ( + TemplatesListsStyle.rbFileTemplate.format(**colors)) + self.classTemplate = ( + TemplatesListsStyle.classTemplate.format(**colors)) + self.methodTemplate = ( + TemplatesListsStyle.methodTemplate.format(**colors)) + self.constructorTemplate = ( + TemplatesListsStyle.constructorTemplate.format(**colors)) + self.rbModuleTemplate = ( + TemplatesListsStyle.rbModuleTemplate.format(**colors)) + self.rbModulesClassTemplate = ( + TemplatesListsStyle.rbModulesClassTemplate.format(**colors)) + self.functionTemplate = ( + TemplatesListsStyle.functionTemplate.format(**colors)) + self.listTemplate = ( + TemplatesListsStyle.listTemplate.format(**colors)) + self.listEntryTemplate = ( + TemplatesListsStyle.listEntryTemplate.format(**colors)) + self.listEntryNoneTemplate = ( + TemplatesListsStyle.listEntryNoneTemplate.format(**colors)) + self.listEntryDeprecatedTemplate = ( TemplatesListsStyle.listEntryDeprecatedTemplate.format( - **colors) - self.listEntrySimpleTemplate = \ - TemplatesListsStyle.listEntrySimpleTemplate.format(**colors) - self.paragraphTemplate = \ - TemplatesListsStyle.paragraphTemplate.format(**colors) - self.parametersListTemplate = \ - TemplatesListsStyle.parametersListTemplate.format(**colors) - self.parametersListEntryTemplate = \ + **colors)) + self.listEntrySimpleTemplate = ( + TemplatesListsStyle.listEntrySimpleTemplate.format(**colors)) + self.paragraphTemplate = ( + TemplatesListsStyle.paragraphTemplate.format(**colors)) + self.parametersListTemplate = ( + TemplatesListsStyle.parametersListTemplate.format(**colors)) + self.parametersListEntryTemplate = ( TemplatesListsStyle.parametersListEntryTemplate.format( - **colors) - self.parameterTypesListEntryTemplate = \ + **colors)) + self.parameterTypesListEntryTemplate = ( TemplatesListsStyle.parameterTypesListEntryTemplate.format( - **colors) - self.returnsTemplate = \ - TemplatesListsStyle.returnsTemplate.format(**colors) - self.returnTypesTemplate = \ - TemplatesListsStyle.returnTypesTemplate.format(**colors) - self.exceptionsListTemplate = \ - TemplatesListsStyle.exceptionsListTemplate.format(**colors) - self.exceptionsListEntryTemplate = \ + **colors)) + self.returnsTemplate = ( + TemplatesListsStyle.returnsTemplate.format(**colors)) + self.returnTypesTemplate = ( + TemplatesListsStyle.returnTypesTemplate.format(**colors)) + self.exceptionsListTemplate = ( + TemplatesListsStyle.exceptionsListTemplate.format(**colors)) + self.exceptionsListEntryTemplate = ( TemplatesListsStyle.exceptionsListEntryTemplate.format( - **colors) - self.signalsListTemplate = \ - TemplatesListsStyle.signalsListTemplate.format(**colors) - self.signalsListEntryTemplate = \ - TemplatesListsStyle.signalsListEntryTemplate.format(**colors) - self.eventsListTemplate = \ - TemplatesListsStyle.eventsListTemplate.format(**colors) - self.eventsListEntryTemplate = \ - TemplatesListsStyle.eventsListEntryTemplate.format(**colors) - self.deprecatedTemplate = \ - TemplatesListsStyle.deprecatedTemplate.format(**colors) - self.authorInfoTemplate = \ - TemplatesListsStyle.authorInfoTemplate.format(**colors) - self.seeListTemplate = \ - TemplatesListsStyle.seeListTemplate.format(**colors) - self.seeListEntryTemplate = \ - TemplatesListsStyle.seeListEntryTemplate.format(**colors) - self.seeLinkTemplate = \ - TemplatesListsStyle.seeLinkTemplate.format(**colors) - self.sinceInfoTemplate = \ - TemplatesListsStyle.sinceInfoTemplate.format(**colors) + **colors)) + self.signalsListTemplate = ( + TemplatesListsStyle.signalsListTemplate.format(**colors)) + self.signalsListEntryTemplate = ( + TemplatesListsStyle.signalsListEntryTemplate.format(**colors)) + self.eventsListTemplate = ( + TemplatesListsStyle.eventsListTemplate.format(**colors)) + self.eventsListEntryTemplate = ( + TemplatesListsStyle.eventsListEntryTemplate.format(**colors)) + self.deprecatedTemplate = ( + TemplatesListsStyle.deprecatedTemplate.format(**colors)) + self.authorInfoTemplate = ( + TemplatesListsStyle.authorInfoTemplate.format(**colors)) + self.seeListTemplate = ( + TemplatesListsStyle.seeListTemplate.format(**colors)) + self.seeListEntryTemplate = ( + TemplatesListsStyle.seeListEntryTemplate.format(**colors)) + self.seeLinkTemplate = ( + TemplatesListsStyle.seeLinkTemplate.format(**colors)) + self.sinceInfoTemplate = ( + TemplatesListsStyle.sinceInfoTemplate.format(**colors)) self.keywords = [] # list of tuples containing the name (string) and @@ -245,11 +245,14 @@ @return The source code documentation. (string) """ - doc = self.headerTemplate.format( - **{'Title': self.module.name, - 'Style': self.stylesheet}) + \ - self.__genModuleSection() + \ + doc = ( + self.headerTemplate.format( + **{'Title': self.module.name, + 'Style': self.stylesheet} + ) + + self.__genModuleSection() + self.footerTemplate + ) self.generated = True return doc @@ -415,12 +418,12 @@ supers = 'None' globalsList = self.__genGlobalsListSection(_class) - classMethList, classMethBodies = \ - self.__genMethodSection(_class, className, Function.Class) - methList, methBodies = \ - self.__genMethodSection(_class, className, Function.General) - staticMethList, staticMethBodies = \ - self.__genMethodSection(_class, className, Function.Static) + classMethList, classMethBodies = self.__genMethodSection( + _class, className, Function.Class) + methList, methBodies = self.__genMethodSection( + _class, className, Function.General) + staticMethList, staticMethBodies = self.__genMethodSection( + _class, className, Function.Static) try: clsBody = self.classTemplate.format( @@ -629,8 +632,8 @@ else: supers = 'None' - methList, methBodies = \ - self.__genMethodSection(_class, className, Function.General) + methList, methBodies = self.__genMethodSection( + _class, className, Function.General) try: clsBody = self.rbModulesClassTemplate.format( @@ -740,8 +743,10 @@ if dotpos == -1: sdlist.append(desc.strip()) else: - while dotpos + 1 < len(desc) and \ - not desc[dotpos + 1].isspace(): + while ( + dotpos + 1 < len(desc) and + not desc[dotpos + 1].isspace() + ): # don't recognize '.' inside a number or word as # stop condition dotpos = desc.find('.', dotpos + 1) @@ -1045,10 +1050,13 @@ m = _signal(desc, 0) if m is None: raise TagError("Wrong format in @signal line.\n") - signalName = 1 and m.group("SignalName1") \ - or m.group("SignalName2") - signalDesc = 1 and m.group("SignalDescription1") \ - or m.group("SignalDescription2") + signalName = ( + 1 and m.group("SignalName1") or m.group("SignalName2") + ) + signalDesc = ( + 1 and m.group("SignalDescription1") or + m.group("SignalDescription2") + ) signalDict[signalName] = [] if signalDesc is not None: signalDict[signalName].append(signalDesc) @@ -1060,10 +1068,13 @@ if m is None: raise TagError( "Wrong format in {0} line.\n".format(parts[0])) - eventName = 1 and m.group("EventName1") \ - or m.group("EventName2") - eventDesc = 1 and m.group("EventDescription1") \ - or m.group("EventDescription2") + eventName = ( + 1 and m.group("EventName1") or m.group("EventName2") + ) + eventDesc = ( + 1 and m.group("EventDescription1") or + m.group("EventDescription2") + ) eventDict[eventName] = [] if eventDesc is not None: eventDict[eventName].append(eventDesc)
--- a/eric6/DocumentationTools/QtHelpGenerator.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/DocumentationTools/QtHelpGenerator.py Sat Sep 21 15:37:43 2019 +0200 @@ -14,8 +14,10 @@ import shutil import subprocess -from Utilities import joinext, relpath, html_encode, getQtBinariesPath, \ - generateQtToolName, isExecutable +from Utilities import ( + joinext, relpath, html_encode, getQtBinariesPath, generateQtToolName, + isExecutable +) HelpCollection = r"""<?xml version="1.0" encoding="utf-8" ?> <QHelpCollectionProject version="1.0"> @@ -82,8 +84,9 @@ self.namespace = namespace self.virtualFolder = virtualFolder self.filterName = filterName - self.filterAttributes = \ + self.filterAttributes = ( filterAttributes and filterAttributes.split(':') or [] + ) self.relPath = relpath(self.htmlDir, self.outputDir) self.title = title self.createCollection = createCollection @@ -248,9 +251,11 @@ f.write(txt) f.close() - if self.createCollection and \ - not os.path.exists( - os.path.join(self.outputDir, HelpCollectionProjectFile)): + if ( + self.createCollection and + not os.path.exists(os.path.join( + self.outputDir, HelpCollectionProjectFile)) + ): collectionAttribs = { "helpfile": HelpHelpFile, }
--- a/eric6/DocumentationTools/TemplatesListsStyle.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/DocumentationTools/TemplatesListsStyle.py Sat Sep 21 15:37:43 2019 +0200 @@ -12,8 +12,7 @@ ## Common templates for index and docu files ## ################################################# -headerTemplate = \ -'''<!DOCTYPE html> +headerTemplate = '''<!DOCTYPE html> <html><head> <title>{{Title}}</title> <meta charset="UTF-8"> @@ -27,8 +26,8 @@ ## Templates for documentation files ## ######################################### -moduleTemplate = \ -'''<a NAME="top" ID="top"></a> +moduleTemplate = ''' +<a NAME="top" ID="top"></a> <h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}"> {{Module}}</h1> {{ModuleDescription}} @@ -43,8 +42,8 @@ {{FunctionList}} <hr />''' -rbFileTemplate = \ -'''<a NAME="top" ID="top"></a> +rbFileTemplate = ''' +<a NAME="top" ID="top"></a> <h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}"> {{Module}}</h1> {{ModuleDescription}} @@ -62,8 +61,8 @@ {{FunctionList}} <hr />''' -classTemplate = \ -'''<hr /> +classTemplate = ''' +<hr /> <a NAME="{{Anchor}}" ID="{{Anchor}}"></a> <h2 style="background-color:{CFBgColor};color:{CFColor}">{{Class}}</h2> {{ClassDescription}} @@ -86,22 +85,22 @@ <div align="right"><a style="color:{LinkColor}" href="#top">Up</a></div> <hr />''' -methodTemplate = \ -'''<a NAME="{{Anchor}}.{{Method}}" ID="{{Anchor}}.{{Method}}"></a> +methodTemplate = ''' +<a NAME="{{Anchor}}.{{Method}}" ID="{{Anchor}}.{{Method}}"></a> <h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}"> {{Class}}.{{Method}}{{MethodClassifier}}</h3> <b>{{Method}}</b>(<i>{{Params}}</i>) {{MethodDescription}}''' -constructorTemplate = \ -'''<a NAME="{{Anchor}}.{{Method}}" ID="{{Anchor}}.{{Method}}"></a> +constructorTemplate = ''' +<a NAME="{{Anchor}}.{{Method}}" ID="{{Anchor}}.{{Method}}"></a> <h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}"> {{Class}} (Constructor)</h3> <b>{{Class}}</b>(<i>{{Params}}</i>) {{MethodDescription}}''' -rbModuleTemplate = \ -'''<hr /> +rbModuleTemplate = ''' +<hr /> <a NAME="{{Anchor}}" ID="{{Anchor}}"></a> <h2 style="background-color:{CFBgColor};color:{CFColor}">{{Module}}</h2> {{ModuleDescription}} @@ -120,8 +119,8 @@ <div align="right"><a style="color:{LinkColor}" href="#top">Up</a></div> <hr />''' -rbModulesClassTemplate = \ -'''<a NAME="{{Anchor}}" ID="{{Anchor}}"></a> +rbModulesClassTemplate = ''' +<a NAME="{{Anchor}}" ID="{{Anchor}}"></a> <h2 style="background-color:{CFBgColor};color:{CFColor}">{{Class}}</h2> {{ClassDescription}} <h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}"> @@ -134,8 +133,8 @@ <div align="right"><a style="color:{LinkColor}" href="#top">Up</a></div> <hr />''' -functionTemplate = \ -'''<hr /> +functionTemplate = ''' +<hr /> <a NAME="{{Anchor}}" ID="{{Anchor}}"></a> <h2 style="background-color:{CFBgColor};color:{CFColor}">{{Function}}</h2> <b>{{Function}}</b>(<i>{{Params}}</i>) @@ -143,13 +142,13 @@ <div align="right"><a style="color:{LinkColor}" href="#top">Up</a></div> <hr />''' -listTemplate = \ -'''<table> +listTemplate = ''' +<table> {{Entries}} </table>''' -listEntryTemplate = \ -'''<tr> +listEntryTemplate = ''' +<tr> <td><a style="color:{LinkColor}" href="#{{Link}}">{{Name}}</a></td> <td>{{Deprecated}}{{Description}}</td> </tr>''' @@ -160,106 +159,106 @@ listEntrySimpleTemplate = '''<tr><td>{{Name}}</td></tr>''' -paragraphTemplate = \ -'''<p> +paragraphTemplate = ''' +<p> {{Lines}} </p>''' -parametersListTemplate = \ -'''<dl> +parametersListTemplate = ''' +<dl> {{Parameters}} </dl>''' -parametersListEntryTemplate = \ -'''<dt><i>{{Name}}</i></dt> +parametersListEntryTemplate = ''' +<dt><i>{{Name}}</i></dt> <dd> {{Description}} </dd>''' -parameterTypesListEntryTemplate = \ -'''<dt><i>{{Name}}</i> ({{Type}})</dt> +parameterTypesListEntryTemplate = ''' +<dt><i>{{Name}}</i> ({{Type}})</dt> <dd> {{Description}} </dd>''' -returnsTemplate = \ -'''<dl> +returnsTemplate = ''' +<dl> <dt>Returns:</dt> <dd> {{0}} </dd> </dl>''' -returnTypesTemplate = \ -'''<dl> +returnTypesTemplate = ''' +<dl> <dt>Return Type:</dt> <dd> {{0}} </dd> </dl>''' -exceptionsListTemplate = \ -'''<dl> +exceptionsListTemplate = ''' +<dl> {{Exceptions}} </dl>''' -exceptionsListEntryTemplate = \ -'''<dt>Raises <b>{{Name}}</b>:</dt> +exceptionsListEntryTemplate = ''' +<dt>Raises <b>{{Name}}</b>:</dt> <dd> {{Description}} </dd>''' -signalsListTemplate = \ -'''<h4>Signals</h4> +signalsListTemplate = ''' +<h4>Signals</h4> <dl> {{Signals}} </dl>''' -signalsListEntryTemplate = \ -'''<dt>{{Name}}</dt> +signalsListEntryTemplate = ''' +<dt>{{Name}}</dt> <dd> {{Description}} </dd>''' -eventsListTemplate = \ -'''<h4>Events</h4> +eventsListTemplate = ''' +<h4>Events</h4> <dl> {{Events}} </dl>''' -eventsListEntryTemplate = \ -'''<dt>{{Name}}</dt> +eventsListEntryTemplate = ''' +<dt>{{Name}}</dt> <dd> {{Description}} </dd>''' -deprecatedTemplate = \ -'''<p> +deprecatedTemplate = ''' +<p> <b>Deprecated.</b> {{Lines}} </p>''' -authorInfoTemplate = \ -'''<p> +authorInfoTemplate = ''' +<p> <i>Author(s)</i>: {{Authors}} </p>''' -seeListTemplate = \ -'''<dl> +seeListTemplate = ''' +<dl> <dt><b>See Also:</b></dt> {{Links}} </dl>''' -seeListEntryTemplate = \ -'''<dd> +seeListEntryTemplate = ''' +<dd> {{Link}} </dd>''' seeLinkTemplate = '''<a style="color:{LinkColor}" {{Link}}''' -sinceInfoTemplate = \ -'''<p> +sinceInfoTemplate = ''' +<p> <b>since</b> {{Info}} </p>''' @@ -288,8 +287,8 @@ {{Entries}} </table>''' -indexListEntryTemplate = \ -'''<tr> +indexListEntryTemplate = ''' +<tr> <td><a style="color:{LinkColor}" href="{{Link}}">{{Name}}</a></td> <td>{{Description}}</td> </tr>'''
--- a/eric6/DocumentationTools/TemplatesListsStyleCSS.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/DocumentationTools/TemplatesListsStyleCSS.py Sat Sep 21 15:37:43 2019 +0200 @@ -12,8 +12,7 @@ ## Common templates for index and docu files ## ################################################# -headerTemplate = \ -'''<!DOCTYPE html> +headerTemplate = '''<!DOCTYPE html> <html><head> <title>{Title}</title> <meta charset="UTF-8"> @@ -30,8 +29,8 @@ ## Templates for documentation files ## ######################################### -moduleTemplate = \ -'''<a NAME="top" ID="top"></a> +moduleTemplate = ''' +<a NAME="top" ID="top"></a> <h1>{Module}</h1> {ModuleDescription} <h3>Global Attributes</h3> @@ -42,8 +41,8 @@ {FunctionList} <hr />''' -rbFileTemplate = \ -'''<a NAME="top" ID="top"></a> +rbFileTemplate = ''' +<a NAME="top" ID="top"></a> <h1>{Module}</h1> {ModuleDescription} <h3>Global Attributes</h3> @@ -56,8 +55,8 @@ {FunctionList} <hr />''' -classTemplate = \ -'''<hr /> +classTemplate = ''' +<hr /> <a NAME="{Anchor}" ID="{Anchor}"></a> <h2>{Class}</h2> {ClassDescription} @@ -75,20 +74,20 @@ <div align="right"><a href="#top">Up</a></div> <hr />''' -methodTemplate = \ -'''<a NAME="{Anchor}.{Method}" ID="{Anchor}.{Method}"></a> +methodTemplate = ''' +<a NAME="{Anchor}.{Method}" ID="{Anchor}.{Method}"></a> <h4>{Class}.{Method}{MethodClassifier}</h4> <b>{Method}</b>(<i>{Params}</i>) {MethodDescription}''' -constructorTemplate = \ -'''<a NAME="{Anchor}.{Method}" ID="{Anchor}.{Method}"></a> +constructorTemplate = ''' +<a NAME="{Anchor}.{Method}" ID="{Anchor}.{Method}"></a> <h4>{Class} (Constructor)</h4> <b>{Class}</b>(<i>{Params}</i>) {MethodDescription}''' -rbModuleTemplate = \ -'''<hr /> +rbModuleTemplate = ''' +<hr /> <a NAME="{Anchor}" ID="{Anchor}"></a> <h2>{Module}</h2> {ModuleDescription} @@ -104,8 +103,8 @@ <div align="right"><a href="#top">Up</a></div> <hr />''' -rbModulesClassTemplate = \ -'''<a NAME="{Anchor}" ID="{Anchor}"></a> +rbModulesClassTemplate = ''' +<a NAME="{Anchor}" ID="{Anchor}"></a> <h2>{Class}</h2> {ClassDescription} <h3>Derived from</h3> @@ -116,8 +115,8 @@ <div align="right"><a href="#top">Up</a></div> <hr />''' -functionTemplate = \ -'''<hr /> +functionTemplate = ''' +<hr /> <a NAME="{Anchor}" ID="{Anchor}"></a> <h2>{Function}</h2> <b>{Function}</b>(<i>{Params}</i>) @@ -125,13 +124,13 @@ <div align="right"><a href="#top">Up</a></div> <hr />''' -listTemplate = \ -'''<table> +listTemplate = ''' +<table> {Entries} </table>''' -listEntryTemplate = \ -'''<tr> +listEntryTemplate = ''' +<tr> <td><a href="#{Link}">{Name}</a></td> <td>{Deprecated}{Description}</td> </tr>''' @@ -142,106 +141,106 @@ listEntrySimpleTemplate = '''<tr><td>{Name}</td></tr>''' -paragraphTemplate = \ -'''<p> +paragraphTemplate = ''' +<p> {Lines} </p>''' -parametersListTemplate = \ -'''<dl> +parametersListTemplate = ''' +<dl> {Parameters} </dl>''' -parametersListEntryTemplate = \ -'''<dt><i>{Name}</i></dt> +parametersListEntryTemplate = ''' +<dt><i>{Name}</i></dt> <dd> {Description} </dd>''' -parameterTypesListEntryTemplate = \ -'''<dt><i>{Name}</i> ({Type})</dt> +parameterTypesListEntryTemplate = ''' +<dt><i>{Name}</i> ({Type})</dt> <dd> {Description} </dd>''' -returnsTemplate = \ -'''<dl> +returnsTemplate = ''' +<dl> <dt>Returns:</dt> <dd> {0} </dd> </dl>''' -returnTypesTemplate = \ -'''<dl> +returnTypesTemplate = ''' +<dl> <dt>Return Type:</dt> <dd> {0} </dd> </dl>''' -exceptionsListTemplate = \ -'''<dl> +exceptionsListTemplate = ''' +<dl> {Exceptions} </dl>''' -exceptionsListEntryTemplate = \ -'''<dt>Raises <b>{Name}</b>:</dt> +exceptionsListEntryTemplate = ''' +<dt>Raises <b>{Name}</b>:</dt> <dd> {Description} </dd>''' -signalsListTemplate = \ -'''<h3>Signals</h3> +signalsListTemplate = ''' +<h3>Signals</h3> <dl> {Signals} </dl>''' -signalsListEntryTemplate = \ -'''<dt>{Name}</dt> +signalsListEntryTemplate = ''' +<dt>{Name}</dt> <dd> {Description} </dd>''' -eventsListTemplate = \ -'''<h3>Events</h3> +eventsListTemplate = ''' +<h3>Events</h3> <dl> {Events} </dl>''' -eventsListEntryTemplate = \ -'''<dt>{Name}</dt> +eventsListEntryTemplate = ''' +<dt>{Name}</dt> <dd> {Description} </dd>''' -deprecatedTemplate = \ -'''<p> +deprecatedTemplate = ''' +<p> <b>Deprecated.</b> {Lines} </p>''' -authorInfoTemplate = \ -'''<p> +authorInfoTemplate = ''' +<p> <i>Author(s)</i>: {Authors} </p>''' -seeListTemplate = \ -'''<dl> +seeListTemplate = ''' +<dl> <dt><b>See Also:</b></dt> {Links} </dl>''' -seeListEntryTemplate = \ -'''<dd> +seeListEntryTemplate = ''' +<dd> {Link} </dd>''' seeLinkTemplate = '''<a {Link}''' -sinceInfoTemplate = \ -'''<p> +sinceInfoTemplate = ''' +<p> <b>since</b> {Info} </p>''' @@ -267,8 +266,8 @@ {Entries} </table>''' -indexListEntryTemplate = \ -'''<tr> +indexListEntryTemplate = ''' +<tr> <td><a href="{Link}">{Name}</a></td> <td>{Description}</td> </tr>'''
--- a/eric6/E5Graphics/E5ArrowItem.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Graphics/E5ArrowItem.py Sat Sep 21 15:37:43 2019 +0200 @@ -92,9 +92,8 @@ """ extra = self._halfLength / 2.0 return QRectF(self._origin, QSizeF(self._end.x() - self._origin.x(), - self._end.y() - self._origin.y()))\ - .normalized()\ - .adjusted(-extra, -extra, extra, extra) + self._end.y() - self._origin.y()) + ).normalized().adjusted(-extra, -extra, extra, extra) def paint(self, painter, option, widget=None): """ @@ -104,8 +103,10 @@ @param option style options (QStyleOptionGraphicsItem) @param widget optional reference to the widget painted on (QWidget) """ - if (option.state & QStyle.State_Selected) == \ - QStyle.State(QStyle.State_Selected): + if ( + (option.state & QStyle.State_Selected) == + QStyle.State(QStyle.State_Selected) + ): width = 2 else: width = 1
--- a/eric6/E5Graphics/E5GraphicsView.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Graphics/E5GraphicsView.py Sat Sep 21 15:37:43 2019 +0200 @@ -312,20 +312,26 @@ fm = painter.fontMetrics() fontHeight = fm.lineSpacing() marginX = printer.pageRect().x() - printer.paperRect().x() - marginX = \ - Preferences.getPrinter("LeftMargin") * int( - printer.resolution() / 2.54) - marginX + marginX = ( + Preferences.getPrinter("LeftMargin") * + int(printer.resolution() / 2.54) - marginX + ) marginY = printer.pageRect().y() - printer.paperRect().y() - marginY = \ - Preferences.getPrinter("TopMargin") * int( - printer.resolution() / 2.54) - marginY + marginY = ( + Preferences.getPrinter("TopMargin") * + int(printer.resolution() / 2.54) - marginY + ) - width = printer.width() - marginX \ - - Preferences.getPrinter("RightMargin") * int( - printer.resolution() / 2.54) - height = printer.height() - fontHeight - 4 - marginY \ - - Preferences.getPrinter("BottomMargin") * int( - printer.resolution() / 2.54) + width = ( + printer.width() - marginX - + Preferences.getPrinter("RightMargin") * + int(printer.resolution() / 2.54) + ) + height = ( + printer.height() - fontHeight - 4 - marginY - + Preferences.getPrinter("BottomMargin") * + int(printer.resolution() / 2.54) + ) border = self.border == 0 and 5 or self.border rect = self._getDiagramRect(border)
--- a/eric6/E5Gui/E5ClickableLabel.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ClickableLabel.py Sat Sep 21 15:37:43 2019 +0200 @@ -45,8 +45,10 @@ self.middleClicked.emit(evt.globalPos()) else: self.clicked.emit(evt.globalPos()) - elif evt.button() == Qt.MidButton and \ - self.rect().contains(evt.pos()): + elif ( + evt.button() == Qt.MidButton and + self.rect().contains(evt.pos()) + ): self.middleClicked.emit(evt.globalPos()) else: super(E5ClickableLabel, self).mouseReleaseEvent(evt)
--- a/eric6/E5Gui/E5ErrorMessage.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ErrorMessage.py Sat Sep 21 15:37:43 2019 +0200 @@ -8,8 +8,10 @@ """ -from PyQt5.QtCore import qInstallMessageHandler, QtDebugMsg, QtWarningMsg, \ - QtCriticalMsg, QtFatalMsg, QThread, QMetaObject, Qt, Q_ARG, QSettings +from PyQt5.QtCore import ( + qInstallMessageHandler, QtDebugMsg, QtWarningMsg, QtCriticalMsg, + QtFatalMsg, QThread, QMetaObject, Qt, Q_ARG, QSettings +) from PyQt5.QtWidgets import QErrorMessage, qApp, QDialog import Globals @@ -122,14 +124,17 @@ message = Utilities.decodeBytes(message) if filterMessage(message): return - message = message.replace("\r\n", "<br/>")\ - .replace("\n", "<br/>")\ - .replace("\r", "<br/>") + message = ( + message.replace("\r\n", "<br/>") + .replace("\n", "<br/>") + .replace("\r", "<br/>") + ) if context.file is not None: - msg = "<p><b>{0}</b></p><p>{1}</p><p>File: {2}</p>" \ - "<p>Line: {3}</p><p>Function: {4}</p>".format( - messageType, Utilities.html_uencode(message), - context.file, context.line, context.function) + msg = ( + "<p><b>{0}</b></p><p>{1}</p><p>File: {2}</p>" + "<p>Line: {3}</p><p>Function: {4}</p>" + ).format(messageType, Utilities.html_uencode(message), + context.file, context.line, context.function) else: msg = "<p><b>{0}</b></p><p>{1}</p>".format( messageType, Utilities.html_uencode(message))
--- a/eric6/E5Gui/E5Led.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5Led.py Sat Sep 21 15:37:43 2019 +0200 @@ -309,8 +309,10 @@ self.middleClicked.emit(evt.globalPos()) else: self.clicked.emit(evt.globalPos()) - elif evt.button() == Qt.MidButton and \ - self.rect().contains(evt.pos()): + elif ( + evt.button() == Qt.MidButton and + self.rect().contains(evt.pos()) + ): self.middleClicked.emit(evt.globalPos()) else: super(E5ClickableLed, self).mouseReleaseEvent(evt)
--- a/eric6/E5Gui/E5LineEdit.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5LineEdit.py Sat Sep 21 15:37:43 2019 +0200 @@ -9,8 +9,10 @@ from PyQt5.QtCore import pyqtSignal, Qt, QEvent -from PyQt5.QtWidgets import QLineEdit, QWidget, QHBoxLayout, QBoxLayout, \ - QLayout, QApplication, QSpacerItem, QSizePolicy +from PyQt5.QtWidgets import ( + QLineEdit, QWidget, QHBoxLayout, QBoxLayout, QLayout, QApplication, + QSpacerItem, QSizePolicy +) import UI.PixmapCache
--- a/eric6/E5Gui/E5ListSelectionDialog.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ListSelectionDialog.py Sat Sep 21 15:37:43 2019 +0200 @@ -9,8 +9,9 @@ from PyQt5.QtCore import pyqtSlot, Qt -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QAbstractItemView, \ - QListWidgetItem +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QAbstractItemView, QListWidgetItem +) from .Ui_E5ListSelectionDialog import Ui_E5ListSelectionDialog
--- a/eric6/E5Gui/E5ListView.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ListView.py Sat Sep 21 15:37:43 2019 +0200 @@ -22,8 +22,10 @@ @param evt reference to the event (QKeyEvent) """ - if evt.key() in [Qt.Key_Delete, Qt.Key_Backspace] and \ - self.model() is not None: + if ( + evt.key() in [Qt.Key_Delete, Qt.Key_Backspace] and + self.model() is not None + ): self.removeSelected() evt.setAccepted(True) else:
--- a/eric6/E5Gui/E5MapWidget.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5MapWidget.py Sat Sep 21 15:37:43 2019 +0200 @@ -249,9 +249,11 @@ @param event reference to the wheel event (QWheelEvent) """ isVertical = event.angleDelta().x() == 0 - if self._master and \ - event.modifiers() == Qt.NoModifier and \ - isVertical: + if ( + self._master and + event.modifiers() == Qt.NoModifier and + isVertical + ): QCoreApplication.sendEvent(self._master.verticalScrollBar(), event) def calculateGeometry(self):
--- a/eric6/E5Gui/E5ModelMenu.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ModelMenu.py Sat Sep 21 15:37:43 2019 +0200 @@ -226,8 +226,10 @@ if self.__model.hasChildren(idx): self.createMenu(idx, -1, menu) else: - if self.__separatorRole != 0 and \ - idx.data(self.__separatorRole): + if ( + self.__separatorRole != 0 and + idx.data(self.__separatorRole) + ): self.addSeparator() else: menu.addAction(self.__makeAction(idx))
--- a/eric6/E5Gui/E5PassivePopup.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5PassivePopup.py Sat Sep 21 15:37:43 2019 +0200 @@ -191,8 +191,8 @@ h = self.minimumSizeHint().height() if qVersionTuple() >= (5, 10, 0): - r = QApplication.screenAt(QPoint(x + w // 2, y + h // 2))\ - .geometry() + r = (QApplication.screenAt(QPoint(x + w // 2, y + h // 2)) + .geometry()) else: r = QApplication.desktop().screenGeometry( QPoint(x + w // 2, y + h // 2))
--- a/eric6/E5Gui/E5PasswordMeter.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5PasswordMeter.py Sat Sep 21 15:37:43 2019 +0200 @@ -38,13 +38,14 @@ ] self.__noIndicator = "#ffffff" - self.__styleSheetTemplate = \ - "QProgressBar {{"\ - " border: 2px solid black;" \ - " border-radius: 5px;" \ - " text-align: center; }}" \ - "QProgressBar::chunk:horizontal {{" \ + self.__styleSheetTemplate = ( + "QProgressBar {{" + " border: 2px solid black;" + " border-radius: 5px;" + " text-align: center; }}" + "QProgressBar::chunk:horizontal {{" " background-color: {0}; }}" + ) self.setStyleSheet( self.__styleSheetTemplate.format(self.__noIndicator))
--- a/eric6/E5Gui/E5ProcessDialog.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ProcessDialog.py Sat Sep 21 15:37:43 2019 +0200 @@ -10,8 +10,9 @@ import os -from PyQt5.QtCore import QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, \ - QProcessEnvironment +from PyQt5.QtCore import ( + QProcess, QTimer, pyqtSlot, Qt, QCoreApplication, QProcessEnvironment +) from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QLineEdit from E5Gui import E5MessageBox @@ -62,8 +63,10 @@ Private slot called when the process finished or the user pressed the button. """ - if self.__process is not None and \ - self.__process.state() != QProcess.NotRunning: + if ( + self.__process is not None and + self.__process.state() != QProcess.NotRunning + ): self.__process.terminate() QTimer.singleShot(2000, self.__process.kill) self.__process.waitForFinished(3000)
--- a/eric6/E5Gui/E5SideBar.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5SideBar.py Sat Sep 21 15:37:43 2019 +0200 @@ -8,10 +8,12 @@ """ -from PyQt5.QtCore import QEvent, QSize, Qt, QByteArray, QDataStream, \ - QIODevice, QTimer -from PyQt5.QtWidgets import QTabBar, QWidget, QStackedWidget, QBoxLayout, \ - QToolButton, QSizePolicy +from PyQt5.QtCore import ( + QEvent, QSize, Qt, QByteArray, QDataStream, QIODevice, QTimer +) +from PyQt5.QtWidgets import ( + QTabBar, QWidget, QStackedWidget, QBoxLayout, QToolButton, QSizePolicy +) from E5Gui.E5Application import e5App @@ -659,8 +661,11 @@ """ if isinstance(now, QWidget): self.__hasFocus = self.isAncestorOf(now) - if self.__autoHide and not self.__hasFocus and \ - not self.isMinimized(): + if ( + self.__autoHide and + not self.__hasFocus and + not self.isMinimized() + ): self.shrink() elif self.__autoHide and self.__hasFocus and self.isMinimized(): self.expand()
--- a/eric6/E5Gui/E5SingleApplication.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5SingleApplication.py Sat Sep 21 15:37:43 2019 +0200 @@ -12,8 +12,9 @@ from E5Gui.E5Application import e5App -from Toolbox.SingleApplication import SingleApplicationClient, \ - SingleApplicationServer +from Toolbox.SingleApplication import ( + SingleApplicationClient, SingleApplicationServer +) import Utilities
--- a/eric6/E5Gui/E5StringListEditWidget.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5StringListEditWidget.py Sat Sep 21 15:37:43 2019 +0200 @@ -8,8 +8,9 @@ """ -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QSortFilterProxyModel, \ - QStringListModel +from PyQt5.QtCore import ( + pyqtSlot, pyqtSignal, Qt, QSortFilterProxyModel, QStringListModel +) from PyQt5.QtWidgets import QWidget, QInputDialog, QLineEdit from .Ui_E5StringListEditWidget import Ui_E5StringListEditWidget
--- a/eric6/E5Gui/E5TabWidget.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5TabWidget.py Sat Sep 21 15:37:43 2019 +0200 @@ -81,9 +81,11 @@ @param event reference to the mouse move event (QMouseEvent) """ - if event.buttons() == Qt.MouseButtons(Qt.LeftButton) and \ - (event.pos() - self.__dragStartPos).manhattanLength() > \ - QApplication.startDragDistance(): + if ( + event.buttons() == Qt.MouseButtons(Qt.LeftButton) and + (event.pos() - self.__dragStartPos).manhattanLength() > + QApplication.startDragDistance() + ): drag = QDrag(self) mimeData = QMimeData() index = self.tabAt(event.pos()) @@ -102,10 +104,12 @@ """ mimeData = event.mimeData() formats = mimeData.formats() - if "action" in formats and \ - mimeData.data("action") == b"tab-reordering" and \ - "tabbar-id" in formats and \ - int(mimeData.data("tabbar-id")) == id(self): + if ( + "action" in formats and + mimeData.data("action") == b"tab-reordering" and + "tabbar-id" in formats and + int(mimeData.data("tabbar-id")) == id(self) + ): event.acceptProposedAction() E5WheelTabBar.dragEnterEvent(self, event)
--- a/eric6/E5Gui/E5TableView.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5TableView.py Sat Sep 21 15:37:43 2019 +0200 @@ -22,8 +22,10 @@ @param evt reference to the event (QKeyEvent) """ - if evt.key() in [Qt.Key_Delete, Qt.Key_Backspace] and \ - self.model() is not None: + if ( + evt.key() in [Qt.Key_Delete, Qt.Key_Backspace] and + self.model() is not None + ): self.removeSelected() evt.setAccepted(True) else:
--- a/eric6/E5Gui/E5TextEditSearchWidget.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5TextEditSearchWidget.py Sat Sep 21 15:37:43 2019 +0200 @@ -10,8 +10,10 @@ from PyQt5.QtCore import pyqtSlot, Qt, QMetaObject, QSize from PyQt5.QtGui import QPalette, QBrush, QColor, QTextDocument, QTextCursor -from PyQt5.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel, \ - QComboBox, QCheckBox, QToolButton, QSizePolicy +from PyQt5.QtWidgets import ( + QWidget, QVBoxLayout, QHBoxLayout, QLabel, QComboBox, QCheckBox, + QToolButton, QSizePolicy +) from E5Gui.E5ComboBox import E5ClearableComboBox @@ -40,10 +42,12 @@ self.__texteditType = "" self.__findBackwards = True - self.__defaultBaseColor = \ + self.__defaultBaseColor = ( self.findtextCombo.lineEdit().palette().color(QPalette.Base) - self.__defaultTextColor = \ + ) + self.__defaultTextColor = ( self.findtextCombo.lineEdit().palette().color(QPalette.Text) + ) self.findHistory = []
--- a/eric6/E5Gui/E5TextInputDialog.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5TextInputDialog.py Sat Sep 21 15:37:43 2019 +0200 @@ -8,8 +8,9 @@ """ -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel, \ - QLineEdit +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QVBoxLayout, QLabel, QLineEdit +) from E5Gui.E5LineEdit import E5ClearableLineEdit
--- a/eric6/E5Gui/E5ToolBarDialog.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ToolBarDialog.py Sat Sep 21 15:37:43 2019 +0200 @@ -10,8 +10,10 @@ from PyQt5.QtCore import pyqtSlot, Qt from PyQt5.QtGui import QColor -from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem, \ - QInputDialog, QLineEdit, QListWidgetItem, QAbstractButton +from PyQt5.QtWidgets import ( + QDialog, QDialogButtonBox, QTreeWidgetItem, QInputDialog, QLineEdit, + QListWidgetItem, QAbstractButton +) from E5Gui import E5MessageBox @@ -75,8 +77,8 @@ self.leftButton.setIcon(UI.PixmapCache.getIcon("1leftarrow.png")) self.rightButton.setIcon(UI.PixmapCache.getIcon("1rightarrow.png")) - self.__restoreDefaultsButton = \ - self.buttonBox.button(QDialogButtonBox.RestoreDefaults) + self.__restoreDefaultsButton = self.buttonBox.button( + QDialogButtonBox.RestoreDefaults) self.__resetButton = self.buttonBox.button(QDialogButtonBox.Reset) self.actionsTree.header().hide() @@ -114,8 +116,8 @@ actionIDs.append(aID) if aID in self.__widgetActionToToolBarItemID: self.__widgetActionToToolBarItemID[aID] = id(tbItem) - self.__toolBarItemToWidgetActionID[id(tbItem)]\ - .append(aID) + self.__toolBarItemToWidgetActionID[id(tbItem)].append( + aID) tbItem.actionIDs = actionIDs self.toolbarComboBox.addItem(tb.windowTitle(), int(id(tbItem))) if default: @@ -176,8 +178,10 @@ index = self.toolbarComboBox.currentIndex() tbItemID = self.toolbarComboBox.itemData(index) tbItem = self.__toolbarItems[tbItemID] - if tbItem.toolBarId is not None and \ - tbItem.toolBarId not in self.__removedToolBarIDs: + if ( + tbItem.toolBarId is not None and + tbItem.toolBarId not in self.__removedToolBarIDs + ): self.__removedToolBarIDs.append(tbItem.toolBarId) del self.__toolbarItems[tbItemID] for widgetActionID in self.__toolBarItemToWidgetActionID[tbItemID]: @@ -212,8 +216,7 @@ return index = self.toolbarComboBox.currentIndex() self.toolbarComboBox.setItemText(index, newName) - tbItem = \ - self.__toolbarItems[self.toolbarComboBox.itemData(index)] + tbItem = self.__toolbarItems[self.toolbarComboBox.itemData(index)] tbItem.title = newName tbItem.isChanged = True @@ -238,8 +241,10 @@ self.upButton.setEnabled(row > 0) self.downButton.setEnabled(row < self.toolbarActionsList.count() - 1) self.leftButton.setEnabled(self.toolbarActionsList.count() > 0) - rightEnable = self.actionsTree.currentItem().parent() is not None or \ + rightEnable = ( + self.actionsTree.currentItem().parent() is not None or self.actionsTree.currentItem().text(0) == self.__separatorText + ) self.rightButton.setEnabled(rightEnable) @pyqtSlot(int) @@ -338,8 +343,8 @@ self.__currentToolBarItem.isChanged = True if actionID in self.__widgetActionToToolBarItemID: self.__widgetActionToToolBarItemID[actionID] = None - self.__toolBarItemToWidgetActionID[id(self.__currentToolBarItem)]\ - .remove(actionID) + self.__toolBarItemToWidgetActionID[ + id(self.__currentToolBarItem)].remove(actionID) itm = self.toolbarActionsList.takeItem(row) del itm self.toolbarActionsList.setCurrentRow(row) @@ -357,8 +362,8 @@ item.setText(self.__separatorText) actionID = None else: - actionID = self.actionsTree.currentItem()\ - .data(0, E5ToolBarDialog.ActionIdRole) + actionID = self.actionsTree.currentItem().data( + 0, E5ToolBarDialog.ActionIdRole) action = self.__manager.actionById(actionID) item.setText(action.text()) item.setIcon(action.icon()) @@ -372,10 +377,10 @@ if oldTbItemID is not None: self.__toolbarItems[oldTbItemID].actionIDs.remove(actionID) self.__toolbarItems[oldTbItemID].isChanged = True - self.__toolBarItemToWidgetActionID[oldTbItemID]\ - .remove(actionID) - self.__widgetActionToToolBarItemID[actionID] = \ - id(self.__currentToolBarItem) + self.__toolBarItemToWidgetActionID[oldTbItemID].remove( + actionID) + self.__widgetActionToToolBarItemID[actionID] = id( + self.__currentToolBarItem) self.__toolBarItemToWidgetActionID[ id(self.__currentToolBarItem)].append(actionID) self.toolbarActionsList.insertItem(row, item)
--- a/eric6/E5Gui/E5ToolBarManager.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ToolBarManager.py Sat Sep 21 15:37:43 2019 +0200 @@ -227,8 +227,11 @@ toRemove = {} newActions = [] for action in actions: - if action is None or \ - (action not in newActions and id(action) in self.__allActions): + if ( + action is None or + (action not in newActions and + id(action) in self.__allActions) + ): newActions.append(action) oldTB = self.toolBarWidgetAction(action) if oldTB is not None and oldTB != toolBar: @@ -302,8 +305,10 @@ @param toolBar reference to the toolbar to be checked (QToolBar) @return flag indicating an added toolbar (boolean) """ - return toolBar is not None and \ + return ( + toolBar is not None and id(toolBar) in self.__defaultToolBars + ) def createToolBar(self, title, name=""): """ @@ -625,8 +630,10 @@ removedActions = [] for action in actions[tbID]: - if action in newActions and \ - self.toolBarWidgetAction(action) == toolBar: + if ( + action in newActions and + self.toolBarWidgetAction(action) == toolBar + ): newActions.remove(action) newActionsWithSeparators.remove(action) removedActions.append(action)
--- a/eric6/E5Gui/E5ToolButton.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5ToolButton.py Sat Sep 21 15:37:43 2019 +0200 @@ -9,8 +9,10 @@ from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QTimer, QSize -from PyQt5.QtWidgets import QToolButton, QStyle, QStyleOptionToolButton, \ - QStyleOption, QApplication, QLabel +from PyQt5.QtWidgets import ( + QToolButton, QStyle, QStyleOptionToolButton, QStyleOption, QApplication, + QLabel +) class E5ToolButton(QToolButton): @@ -197,13 +199,17 @@ if self.popupMode() == QToolButton.DelayedPopup: self.__pressTimer.start() - if evt.buttons() == Qt.LeftButton and \ - self.__menu is not None and \ - self.popupMode() == QToolButton.InstantPopup: + if ( + evt.buttons() == Qt.LeftButton and + self.__menu is not None and + self.popupMode() == QToolButton.InstantPopup + ): self.setDown(True) self.__showMenu() - elif evt.buttons() == Qt.RightButton and \ - self.__menu is not None: + elif ( + evt.buttons() == Qt.RightButton and + self.__menu is not None + ): self.setDown(True) self.__showMenu() else: @@ -218,13 +224,17 @@ """ self.__pressTimer.stop() - if evt.button() == Qt.MiddleButton and \ - self.rect().contains(evt.pos()): + if ( + evt.button() == Qt.MiddleButton and + self.rect().contains(evt.pos()) + ): self.middleClicked.emit() self.setDown(False) - elif evt.button() == Qt.LeftButton and \ - self.rect().contains(evt.pos()) and \ - evt.modifiers() == Qt.ControlModifier: + elif ( + evt.button() == Qt.LeftButton and + self.rect().contains(evt.pos()) and + evt.modifiers() == Qt.ControlModifier + ): self.controlClicked.emit() self.setDown(False) else:
--- a/eric6/E5Gui/E5TreeView.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5TreeView.py Sat Sep 21 15:37:43 2019 +0200 @@ -22,8 +22,10 @@ @param evt reference to the event (QKeyEvent) """ - if evt.key() in [Qt.Key_Delete, Qt.Key_Backspace] and \ - self.model() is not None: + if ( + evt.key() in [Qt.Key_Delete, Qt.Key_Backspace] and + self.model() is not None + ): self.removeSelected() evt.setAccepted(True) else: @@ -33,9 +35,11 @@ """ Public method to remove the selected entries. """ - if self.model() is None or \ - self.selectionModel() is None or \ - not self.selectionModel().hasSelection(): + if ( + self.model() is None or + self.selectionModel() is None or + not self.selectionModel().hasSelection() + ): # no models available or nothing selected return
--- a/eric6/E5Gui/E5TreeWidget.py Sat Sep 21 13:37:58 2019 +0200 +++ b/eric6/E5Gui/E5TreeWidget.py Sat Sep 21 15:37:43 2019 +0200 @@ -247,8 +247,10 @@ @param evt mouse press event (QMouseEvent) """ - if evt.modifiers() == Qt.ControlModifier and \ - evt.buttons() == Qt.LeftButton: + if ( + evt.modifiers() == Qt.ControlModifier and + evt.buttons() == Qt.LeftButton + ): self.itemControlClicked.emit(self.itemAt(evt.pos())) return elif evt.buttons() == Qt.MidButton: