Mon, 04 Mar 2024 11:42:39 +0100
Corrected some code formatting issues.
--- a/src/eric7/CodeFormatting/BlackConfigurationDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/CodeFormatting/BlackConfigurationDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -263,12 +263,12 @@ configuration["source"] = self.sourceComboBox.currentData() configuration["target-version"] = self.__getTargetList() configuration["line-length"] = self.lineLengthSpinBox.value() - configuration[ - "skip-string-normalization" - ] = self.skipStringNormalCheckBox.isChecked() - configuration[ - "skip-magic-trailing-comma" - ] = self.skipMagicCommaCheckBox.isChecked() + configuration["skip-string-normalization"] = ( + self.skipStringNormalCheckBox.isChecked() + ) + configuration["skip-magic-trailing-comma"] = ( + self.skipMagicCommaCheckBox.isChecked() + ) configuration["extend-exclude"] = self.excludeEdit.toPlainText().strip() if saveToProject and self.__project:
--- a/src/eric7/CodeFormatting/BlackFormattingDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/CodeFormatting/BlackFormattingDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -578,9 +578,11 @@ self.resultsList, [ statusMsg, - self.__project.getRelativePath(filename) - if self.__project - else filename, + ( + self.__project.getRelativePath(filename) + if self.__project + else filename + ), ], ) itm.setData(0, BlackFormattingDialog.StatusRole, status)
--- a/src/eric7/CodeFormatting/IsortConfigurationDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/CodeFormatting/IsortConfigurationDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -98,9 +98,11 @@ for pyTarget in VALID_PY_TARGETS: if pyTarget.startswith("3"): self.pythonComboBox.addItem( - self.tr("Python {0}").format(pyTarget) - if len(pyTarget) == 1 - else self.tr("Python {0}.{1}").format(pyTarget[0], pyTarget[1:]), + ( + self.tr("Python {0}").format(pyTarget) + if len(pyTarget) == 1 + else self.tr("Python {0}.{1}").format(pyTarget[0], pyTarget[1:]) + ), pyTarget, )
--- a/src/eric7/CodeFormatting/IsortFormattingDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/CodeFormatting/IsortFormattingDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -389,9 +389,11 @@ self.resultsList, [ statusMsg, - self.__project.getRelativePath(filename) - if self.__project - else filename, + ( + self.__project.getRelativePath(filename) + if self.__project + else filename + ), ], ) itm.setData(0, IsortFormattingDialog.StatusRole, status)
--- a/src/eric7/DocumentationTools/ModuleDocumentor.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/DocumentationTools/ModuleDocumentor.py Mon Mar 04 11:42:39 2024 +0100 @@ -216,9 +216,11 @@ "Description": self.__getShortDescription( sectionDict[name].description ), - "Deprecated": TemplatesListsStyleCSS.listEntryDeprecatedTemplate - if self.__checkDeprecated(sectionDict[name].description) - else "", + "Deprecated": ( + TemplatesListsStyleCSS.listEntryDeprecatedTemplate + if self.__checkDeprecated(sectionDict[name].description) + else "" + ), } ) ) @@ -415,9 +417,11 @@ "Description": self.__getShortDescription( sectionDict[name].description ), - "Deprecated": TemplatesListsStyleCSS.listEntryDeprecatedTemplate - if self.__checkDeprecated(sectionDict[name].description) - else "", + "Deprecated": ( + TemplatesListsStyleCSS.listEntryDeprecatedTemplate + if self.__checkDeprecated(sectionDict[name].description) + else "" + ), } ) ) @@ -643,9 +647,11 @@ "Description": self.__getShortDescription( sectionDict[name].description ), - "Deprecated": TemplatesListsStyleCSS.listEntryDeprecatedTemplate - if self.__checkDeprecated(sectionDict[name].description) - else "", + "Deprecated": ( + TemplatesListsStyleCSS.listEntryDeprecatedTemplate + if self.__checkDeprecated(sectionDict[name].description) + else "" + ), } ) )
--- a/src/eric7/EricWidgets/EricToolBarDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/EricWidgets/EricToolBarDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -106,9 +106,11 @@ item.setData( 0, Qt.ItemDataRole.ForegroundRole, - QColor("#8b8bff") - if ericApp().usesDarkPalette() - else QColor(Qt.GlobalColor.blue), + ( + QColor("#8b8bff") + if ericApp().usesDarkPalette() + else QColor(Qt.GlobalColor.blue) + ), ) self.__widgetActionToToolBarItemID[id(action)] = None categoryItem.setExpanded(True)
--- a/src/eric7/MicroPython/BluetoothDialogs/BluetoothScanWindow.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/MicroPython/BluetoothDialogs/BluetoothScanWindow.py Mon Mar 04 11:42:39 2024 +0100 @@ -104,9 +104,11 @@ template.format( bits, serviceID, - self.tr(" - {0}").format(serviceName) - if serviceName - else "", + ( + self.tr(" - {0}").format(serviceName) + if serviceName + else "" + ), ) ], ) @@ -118,11 +120,13 @@ citm = QTreeWidgetItem( itm, [ - self.tr("Manufacturer ID: 0x{0:x} - {1}").format( - mid, mname + ( + self.tr("Manufacturer ID: 0x{0:x} - {1}").format( + mid, mname + ) + if bool(mname) + else self.tr("Manufacturer ID: 0x{0:x}").format(mid) ) - if bool(mname) - else self.tr("Manufacturer ID: 0x{0:x}").format(mid) ], ) citm.setFirstColumnSpanned(True)
--- a/src/eric7/MicroPython/BoardDataDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/MicroPython/BoardDataDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -84,9 +84,11 @@ self.tr("{0} V. {1}{2}").format( mpyName, mpyVersion, - self.tr(" ({0})").format(data["mpy_variant"]) - if data["mpy_variant"] - else "", + ( + self.tr(" ({0})").format(data["mpy_variant"]) + if data["mpy_variant"] + else "" + ), ), ], )
--- a/src/eric7/MicroPython/Devices/CircuitPythonUpdater/CircuitPythonUpdaterInterface.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonUpdater/CircuitPythonUpdaterInterface.py Mon Mar 04 11:42:39 2024 +0100 @@ -547,12 +547,14 @@ """<ul><li>{0}</li></ul>""".format( "</li><li>".join(sorted(installs)) ), - self.tr("Dependencies:") - + """<ul><li>{0}</li></ul>""".format( - "</li><li>".join(sorted(dependencies)) - ) - if dependencies - else "", + ( + self.tr("Dependencies:") + + """<ul><li>{0}</li></ul>""".format( + "</li><li>".join(sorted(dependencies)) + ) + if dependencies + else "" + ), ), yesDefault=True, )
--- a/src/eric7/MicroPython/Devices/CircuitPythonUpdater/ShowOutdatedDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/MicroPython/Devices/CircuitPythonUpdater/ShowOutdatedDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -84,12 +84,16 @@ self.modulesList, [ module.name, - module.device_version - if module.device_version - else self.tr("unknown"), - module.bundle_version - if module.bundle_version - else self.tr("unknown"), + ( + module.device_version + if module.device_version + else self.tr("unknown") + ), + ( + module.bundle_version + if module.bundle_version + else self.tr("unknown") + ), reason, ], ) @@ -97,9 +101,11 @@ itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable) itm.setCheckState( 0, - Qt.CheckState.Checked - if needsUpdate - else Qt.CheckState.Unchecked, + ( + Qt.CheckState.Checked + if needsUpdate + else Qt.CheckState.Unchecked + ), ) if needsUpdate: self.__checkCount += 1
--- a/src/eric7/MicroPython/Devices/GenericMicroPythonDevices.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/MicroPython/Devices/GenericMicroPythonDevices.py Mon Mar 04 11:42:39 2024 +0100 @@ -314,11 +314,13 @@ ).format( currentVersionStr, tag, - self.tr("<tr><td>Variant:</td><td>{0}</td></tr>").format( - self._deviceData["mpy_variant"] - ) - if self._deviceData["mpy_variant"] - else "", + ( + self.tr("<tr><td>Variant:</td><td>{0}</td></tr>").format( + self._deviceData["mpy_variant"] + ) + if self._deviceData["mpy_variant"] + else "" + ), ) if currentVersion < latestVersion: msg += self.tr("<p><b>Update available!</b></p>")
--- a/src/eric7/MicroPython/Devices/RP2040Devices.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/MicroPython/Devices/RP2040Devices.py Mon Mar 04 11:42:39 2024 +0100 @@ -313,11 +313,13 @@ ).format( currentVersionStr, tag, - self.tr("<tr><td>Variant:</td><td>{0}</td></tr>").format( - self._deviceData["mpy_variant"] - ) - if self._deviceData["mpy_variant"] - else "", + ( + self.tr("<tr><td>Variant:</td><td>{0}</td></tr>").format( + self._deviceData["mpy_variant"] + ) + if self._deviceData["mpy_variant"] + else "" + ), ) if self._deviceData["mpy_variant"] in ["Pimoroni Pico"] and not bool( self._deviceData["mpy_variant_version"]
--- a/src/eric7/MicroPython/MicroPythonFileManager.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/MicroPython/MicroPythonFileManager.py Mon Mar 04 11:42:39 2024 +0100 @@ -118,9 +118,11 @@ mode2string(mode), str(size), mtime2string(mtime, adjustEpoch=adjustEpoch), - f"{dirname}{name}" - if dirname.endswith("/") - else f"{dirname}/{name}", + ( + f"{dirname}{name}" + if dirname.endswith("/") + else f"{dirname}/{name}" + ), ) for name, (mode, size, mtime) in filesList ]
--- a/src/eric7/Network/IRC/IrcIdentitiesEditDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Network/IRC/IrcIdentitiesEditDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -55,9 +55,9 @@ self.__currentIdentity = None identities = sorted(self.__manager.getIdentityNames()) - identities[ - identities.index(IrcIdentity.DefaultIdentityName) - ] = IrcIdentity.DefaultIdentityDisplay + identities[identities.index(IrcIdentity.DefaultIdentityName)] = ( + IrcIdentity.DefaultIdentityDisplay + ) self.identitiesCombo.addItems(identities) if identityName == IrcIdentity.DefaultIdentityName: identityName = IrcIdentity.DefaultIdentityDisplay
--- a/src/eric7/Network/IRC/IrcNetworkEditDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Network/IRC/IrcNetworkEditDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -103,9 +103,9 @@ self.identityCombo.clear() identities = sorted(self.__manager.getIdentityNames()) - identities[ - identities.index(IrcIdentity.DefaultIdentityName) - ] = IrcIdentity.DefaultIdentityDisplay + identities[identities.index(IrcIdentity.DefaultIdentityName)] = ( + IrcIdentity.DefaultIdentityDisplay + ) self.identityCombo.addItems(identities) if currentIdentity == IrcIdentity.DefaultIdentityName: currentIdentity = IrcIdentity.DefaultIdentityDisplay
--- a/src/eric7/PipInterface/PipPackageDetailsDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/PipInterface/PipPackageDetailsDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -115,9 +115,11 @@ self.homePageLabel.setText( '<a href="{0}">{0}</a>'.format( self.__sanitize( - detailsData["project_urls"]["Homepage"] - if "Homepage" in detailsData["project_urls"] - else detailsData["home_page"], + ( + detailsData["project_urls"]["Homepage"] + if "Homepage" in detailsData["project_urls"] + else detailsData["home_page"] + ), forUrl=True, ) ) @@ -135,9 +137,11 @@ self.docsUrlLabel.setText( '<a href="{0}">{0}</a>'.format( self.__sanitize( - detailsData["project_urls"]["Documentation"] - if "Documentation" in detailsData["project_urls"] - else detailsData["docs_url"], + ( + detailsData["project_urls"]["Documentation"] + if "Documentation" in detailsData["project_urls"] + else detailsData["docs_url"] + ), forUrl=True, ) ) @@ -164,12 +168,16 @@ self.downloadUrlsList, [ "", - self.__packageTypeMap[download["packagetype"]] - if download["packagetype"] in self.__packageTypeMap - else "", - download["python_version"] - if download["python_version"] != "source" - else "", + ( + self.__packageTypeMap[download["packagetype"]] + if download["packagetype"] in self.__packageTypeMap + else "" + ), + ( + download["python_version"] + if download["python_version"] != "source" + else "" + ), self.__formatUploadDate(download["upload_time"]), self.__formatSize(download["size"]), ],
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -602,14 +602,14 @@ ) if "CheckFutureAnnotations" not in self.__data["AnnotationsChecker"]: # third extension - self.__data["AnnotationsChecker"][ - "CheckFutureAnnotations" - ] = defaultParameters["AnnotationsChecker"]["CheckFutureAnnotations"] + self.__data["AnnotationsChecker"]["CheckFutureAnnotations"] = ( + defaultParameters["AnnotationsChecker"]["CheckFutureAnnotations"] + ) if "ExemptedTypingSymbols" not in self.__data["AnnotationsChecker"]: # fourth extension - self.__data["AnnotationsChecker"][ - "ExemptedTypingSymbols" - ] = defaultParameters["AnnotationsChecker"]["ExemptedTypingSymbols"] + self.__data["AnnotationsChecker"]["ExemptedTypingSymbols"] = ( + defaultParameters["AnnotationsChecker"]["ExemptedTypingSymbols"] + ) self.__initCategoriesList(self.__data["EnabledCheckerCategories"]) self.excludeFilesEdit.setText(self.__data["ExcludeFiles"])
--- a/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -103,10 +103,10 @@ self.parameters["outputDirectory"] = FileSystemUtilities.toNativeSeparators( self.parameters["outputDirectory"] ) - self.parameters[ - "qtHelpOutputDirectory" - ] = FileSystemUtilities.toNativeSeparators( - self.parameters["qtHelpOutputDirectory"] + self.parameters["qtHelpOutputDirectory"] = ( + FileSystemUtilities.toNativeSeparators( + self.parameters["qtHelpOutputDirectory"] + ) ) self.parameters["cssFile"] = FileSystemUtilities.toNativeSeparators( self.parameters["cssFile"] @@ -600,13 +600,13 @@ self.parameters["qtHelpNamespace"] = self.qtHelpNamespaceEdit.text() self.parameters["qtHelpVirtualFolder"] = self.qtHelpFolderEdit.text() self.parameters["qtHelpFilterName"] = self.qtHelpFilterNameEdit.text() - self.parameters[ - "qtHelpFilterAttributes" - ] = self.qtHelpFilterAttributesEdit.text() + self.parameters["qtHelpFilterAttributes"] = ( + self.qtHelpFilterAttributesEdit.text() + ) self.parameters["qtHelpTitle"] = self.qtHelpTitleEdit.text() - self.parameters[ - "qtHelpCreateCollection" - ] = self.qtHelpGenerateCollectionCheckBox.isChecked() + self.parameters["qtHelpCreateCollection"] = ( + self.qtHelpGenerateCollectionCheckBox.isChecked() + ) # call the accept slot of the base class super().accept()
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/git.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsGit/git.py Mon Mar 04 11:42:39 2024 +0100 @@ -1201,9 +1201,9 @@ else: self.statusCache[name] = VersionControlState.Uncontrolled if dirName not in self.statusCache: - self.statusCache[ - dirName - ] = VersionControlState.Uncontrolled + self.statusCache[dirName] = ( + VersionControlState.Uncontrolled + ) return names
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Mon Mar 04 11:42:39 2024 +0100 @@ -75,9 +75,9 @@ self.__extensionMenuTitles = {} for extension in self.__extensions: - self.__extensionMenuTitles[ - self.__extensions[extension].menuTitle() - ] = extension + self.__extensionMenuTitles[self.__extensions[extension].menuTitle()] = ( + extension + ) self.__extensionMenus = {} for extension in self.__extensions: self.__extensionMenus[extension] = self.__extensions[extension].initMenus()
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon Mar 04 11:42:39 2024 +0100 @@ -64,9 +64,9 @@ self.__extensionMenuTitles = {} for extension in self.__extensions: - self.__extensionMenuTitles[ - self.__extensions[extension].menuTitle() - ] = extension + self.__extensionMenuTitles[self.__extensions[extension].menuTitle()] = ( + extension + ) self.__toolbarManager = None
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Mar 04 11:42:39 2024 +0100 @@ -1190,9 +1190,9 @@ else: self.statusCache[name] = VersionControlState.Uncontrolled if dirName not in self.statusCache: - self.statusCache[ - dirName - ] = VersionControlState.Uncontrolled + self.statusCache[dirName] = ( + VersionControlState.Uncontrolled + ) return names
--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -497,9 +497,9 @@ ) if self.descriptionContentTypeComboBox.currentData(): - metadata[ - "long_description_content_type" - ] = self.descriptionContentTypeComboBox.currentData() + metadata["long_description_content_type"] = ( + self.descriptionContentTypeComboBox.currentData() + ) if self.authorEdit.text(): metadata["author"] = self.authorEdit.text() @@ -591,9 +591,9 @@ } for row in range(self.entryPointsList.topLevelItemCount()): itm = self.entryPointsList.topLevelItem(row) - entryPoints[itm.data(0, Qt.ItemDataRole.UserRole)][ - itm.text(1) - ] = itm.text(2) + entryPoints[itm.data(0, Qt.ItemDataRole.UserRole)][itm.text(1)] = ( + itm.text(2) + ) for epType in list(entryPoints): if entryPoints[epType]: entryPoints[epType] = SetupCfgUtilities.toString( @@ -648,9 +648,9 @@ else: readme = tomlkit.table() readme["text"] = self.descriptionEdit.toPlainText() - readme[ - "content-type" - ] = self.descriptionContentTypeComboBox.currentData() + readme["content-type"] = ( + self.descriptionContentTypeComboBox.currentData() + ) project["readme"] = readme if self.authorEdit.text(): @@ -736,9 +736,9 @@ } for row in range(self.entryPointsList.topLevelItemCount()): itm = self.entryPointsList.topLevelItem(row) - entryPoints[itm.data(0, Qt.ItemDataRole.UserRole)][ - itm.text(1) - ] = itm.text(2) + entryPoints[itm.data(0, Qt.ItemDataRole.UserRole)][itm.text(1)] = ( + itm.text(2) + ) if entryPoints["console_scripts"]: scripts = tomlkit.table()
--- a/src/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py Mon Mar 04 11:42:39 2024 +0100 @@ -44,9 +44,9 @@ projectTypes = ericApp().getObject("Project").getProjectTypes() for projectType in sorted(projectTypes): self.projectTypeCombo.addItem(projectTypes[projectType], projectType) - self.__projectBrowsersLists[ - projectType - ] = Preferences.getProjectBrowsers(projectType) + self.__projectBrowsersLists[projectType] = ( + Preferences.getProjectBrowsers(projectType) + ) except KeyError: self.pbGroup.setEnabled(False) self.pbGroup.setVisible(False)
--- a/src/eric7/Preferences/__init__.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Preferences/__init__.py Mon Mar 04 11:42:39 2024 +0100 @@ -1328,18 +1328,18 @@ if QtUtilities.qVersionTuple() >= (6, 4, 0): # Qt 6.4+ - cls.webBrowserDefaults[ - "NavigateOnDropEnabled" - ] = webEngineSettings.testAttribute( - QWebEngineSettings.WebAttribute.NavigateOnDropEnabled + cls.webBrowserDefaults["NavigateOnDropEnabled"] = ( + webEngineSettings.testAttribute( + QWebEngineSettings.WebAttribute.NavigateOnDropEnabled + ) ) if QtUtilities.qVersionTuple() >= (6, 6, 0): # Qt 6.6+ - cls.webBrowserDefaults[ - "ReadingFromCanvasEnabled" - ] = webEngineSettings.testAttribute( - QWebEngineSettings.WebAttribute.ReadingFromCanvasEnabled + cls.webBrowserDefaults["ReadingFromCanvasEnabled"] = ( + webEngineSettings.testAttribute( + QWebEngineSettings.WebAttribute.ReadingFromCanvasEnabled + ) ) cls.webEngineSettingsIntitialized = True
--- a/src/eric7/Project/DebuggerPropertiesDialog.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Project/DebuggerPropertiesDialog.py Mon Mar 04 11:42:39 2024 +0100 @@ -160,28 +160,28 @@ debugClient = "" self.project.debugProperties["DEBUGCLIENT"] = debugClient - self.project.debugProperties[ - "ENVIRONMENTOVERRIDE" - ] = self.debugEnvironmentOverrideCheckBox.isChecked() - self.project.debugProperties[ - "ENVIRONMENTSTRING" - ] = self.debugEnvironmentEdit.text() - self.project.debugProperties[ - "REMOTEDEBUGGER" - ] = self.remoteDebuggerGroup.isChecked() + self.project.debugProperties["ENVIRONMENTOVERRIDE"] = ( + self.debugEnvironmentOverrideCheckBox.isChecked() + ) + self.project.debugProperties["ENVIRONMENTSTRING"] = ( + self.debugEnvironmentEdit.text() + ) + self.project.debugProperties["REMOTEDEBUGGER"] = ( + self.remoteDebuggerGroup.isChecked() + ) self.project.debugProperties["REMOTEHOST"] = self.remoteHostEdit.text() self.project.debugProperties["REMOTECOMMAND"] = self.remoteCommandEdit.text() - self.project.debugProperties[ - "REMOTEDEBUGCLIENT" - ] = self.remoteDebugClientEdit.text() - self.project.debugProperties[ - "PATHTRANSLATION" - ] = self.pathTranslationGroup.isChecked() + self.project.debugProperties["REMOTEDEBUGCLIENT"] = ( + self.remoteDebugClientEdit.text() + ) + self.project.debugProperties["PATHTRANSLATION"] = ( + self.pathTranslationGroup.isChecked() + ) self.project.debugProperties["REMOTEPATH"] = self.translationRemoteEdit.text() self.project.debugProperties["LOCALPATH"] = self.translationLocalEdit.text() - self.project.debugProperties[ - "CONSOLEDEBUGGER" - ] = self.consoleDebuggerGroup.isChecked() + self.project.debugProperties["CONSOLEDEBUGGER"] = ( + self.consoleDebuggerGroup.isChecked() + ) self.project.debugProperties["CONSOLECOMMAND"] = self.consoleCommandEdit.text() self.project.debugProperties["REDIRECT"] = self.redirectCheckBox.isChecked() self.project.debugProperties["NOENCODING"] = self.noEncodingCheckBox.isChecked()
--- a/src/eric7/Project/Project.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Project/Project.py Mon Mar 04 11:42:39 2024 +0100 @@ -1394,10 +1394,7 @@ fn1, ext = os.path.splitext(os.path.basename(self.pfile)) fn = os.path.join(self.getProjectManagementDir(), "{0}.edj".format(fn1)) - if ( - os.path.exists(fn) - and self.__debuggerPropertiesFile.readFile(fn) - ): + if os.path.exists(fn) and self.__debuggerPropertiesFile.readFile(fn): self.debugPropertiesLoaded = True self.debugPropertiesChanged = False
--- a/src/eric7/Project/ProjectBrowser.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Project/ProjectBrowser.py Mon Mar 04 11:42:39 2024 +0100 @@ -192,9 +192,9 @@ ) else: self.__browserRepository[browserType] = projectBrowserItem - self.__fileFilterMapping[ - projectBrowserItem.fileCategory - ] = projectBrowserItem.fileFilter + self.__fileFilterMapping[projectBrowserItem.fileCategory] = ( + projectBrowserItem.fileFilter + ) self.__setBrowsersAvailable(self.__currentBrowsersList)
--- a/src/eric7/QScintilla/Editor.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/QScintilla/Editor.py Mon Mar 04 11:42:39 2024 +0100 @@ -1468,10 +1468,11 @@ self.marginMenuActs["ToggleAllFolds"] = self.foldMarginMenu.addAction( self.tr("Toggle all folds"), self.foldAll ) - self.marginMenuActs[ - "ToggleAllFoldsAndChildren" - ] = self.foldMarginMenu.addAction( - self.tr("Toggle all folds (including children)"), lambda: self.foldAll(True) + self.marginMenuActs["ToggleAllFoldsAndChildren"] = ( + self.foldMarginMenu.addAction( + self.tr("Toggle all folds (including children)"), + lambda: self.foldAll(True), + ) ) self.marginMenuActs["ToggleCurrentFold"] = self.foldMarginMenu.addAction( self.tr("Toggle current fold"), self.toggleCurrentFold @@ -3455,9 +3456,11 @@ self, self.tr("File Modified"), self.tr("<p>The file <b>{0}</b> has unsaved changes.</p>").format(fn), - self.saveFile - if not FileSystemUtilities.isRemoteFileName(self.fileName) - else None, + ( + self.saveFile + if not FileSystemUtilities.isRemoteFileName(self.fileName) + else None + ), ) if res: self.vm.setEditorName(self, self.fileName)
--- a/src/eric7/QScintilla/Shell.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/QScintilla/Shell.py Mon Mar 04 11:42:39 2024 +0100 @@ -2128,7 +2128,7 @@ line = self.getCursorPosition()[0] text = self.text(line).strip() self.__showSourceAct.setEnabled( - bool(re.search(r'File: (.*?), Line: (\d+)', text)) + bool(re.search(r"File: (.*?), Line: (\d+)", text)) ) self.menu.popup(self.mapToGlobal(pos)) @@ -2653,15 +2653,17 @@ def __showSource(self): """ Private method to open an editor for an exception line. - + Note: The exception line looks like 'File: /path/of/file.py, Line: 111'. """ line = self.getCursorPosition()[0] text = self.text(line).strip() - match = re.search(r'File: (.*?), Line: (\d+)', text) + match = re.search(r"File: (.*?), Line: (\d+)", text) if match: filename = match.group(1) linenumber = int(match.group(2)) self.vm.openSourceFile(filename, lineno=linenumber) + + # # eflag: noqa = M601
--- a/src/eric7/Sessions/SessionFile.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/Sessions/SessionFile.py Mon Mar 04 11:42:39 2024 +0100 @@ -57,9 +57,9 @@ # step 0: header sessionDict = {"header": {}} if not self.__isGlobal: - sessionDict["header"][ - "comment" - ] = "eric session file for project {0}".format(project.getProjectName()) + sessionDict["header"]["comment"] = ( + "eric session file for project {0}".format(project.getProjectName()) + ) sessionDict["header"][ "warning" ] = "This file was generated automatically, do not edit."
--- a/src/eric7/UI/FindFileWidget.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/UI/FindFileWidget.py Mon Mar 04 11:42:39 2024 +0100 @@ -763,11 +763,13 @@ rline = "{0} ...".format(line[:1024]) line = "- {0}\n+ {1}".format( line, - "\n ".join( - Utilities.slash(rl) for rl in rline.splitlines(True) - ) - if esc - else self.__stripEol(rline), + ( + "\n ".join( + Utilities.slash(rl) for rl in rline.splitlines(True) + ) + if esc + else self.__stripEol(rline) + ), ) self.__createItem(file, count, line, start, end, rline, hashStr)
--- a/src/eric7/UI/LogView.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/UI/LogView.py Mon Mar 04 11:42:39 2024 +0100 @@ -276,9 +276,11 @@ self.find( QRegularExpression( txt, - QRegularExpression.PatternOption.NoPatternOption - if caseSensitive - else QRegularExpression.PatternOption.CaseInsensitiveOption, + ( + QRegularExpression.PatternOption.NoPatternOption + if caseSensitive + else QRegularExpression.PatternOption.CaseInsensitiveOption + ), ), flags, ) @@ -310,9 +312,11 @@ self.find( QRegularExpression( txt, - QRegularExpression.PatternOption.NoPatternOption - if caseSensitive - else QRegularExpression.PatternOption.CaseInsensitiveOption, + ( + QRegularExpression.PatternOption.NoPatternOption + if caseSensitive + else QRegularExpression.PatternOption.CaseInsensitiveOption + ), ), flags, )
--- a/src/eric7/ViewManager/ViewManager.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/ViewManager/ViewManager.py Mon Mar 04 11:42:39 2024 +0100 @@ -5456,9 +5456,13 @@ "ViewManager", """<p>The file <b>{0}</b> has unsaved changes.</p>""", ).format(fn), - editor.saveFile - if not FileSystemUtilities.isRemoteFileName(editor.getFileName()) - else None, + ( + editor.saveFile + if not FileSystemUtilities.isRemoteFileName( + editor.getFileName() + ) + else None + ), ) if res: self.setEditorName(editor, editor.getFileName())
--- a/src/eric7/VirtualEnv/VirtualenvManager.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/VirtualEnv/VirtualenvManager.py Mon Mar 04 11:42:39 2024 +0100 @@ -115,12 +115,12 @@ break if not found: # add an environment entry for the default interpreter - self.__virtualEnvironments[ - VirtualenvManager.DefaultKey - ] = VirtualenvMetaData( - name=VirtualenvManager.DefaultKey, - interpreter=defaultPy, - is_global=True, + self.__virtualEnvironments[VirtualenvManager.DefaultKey] = ( + VirtualenvMetaData( + name=VirtualenvManager.DefaultKey, + interpreter=defaultPy, + is_global=True, + ) ) self.__cleanEnvironments()
--- a/src/eric7/eric7_ide.py Mon Mar 04 11:26:52 2024 +0100 +++ b/src/eric7/eric7_ide.py Mon Mar 04 11:42:39 2024 +0100 @@ -417,9 +417,11 @@ app, loc, splash, - None - if args.plugin is None - else os.path.abspath(os.path.expanduser(args.plugin)), + ( + None + if args.plugin is None + else os.path.abspath(os.path.expanduser(args.plugin)) + ), args.disable_plugin, args.no_open, args.no_crash,