Fri, 08 Mar 2024 16:08:43 +0100
Corrected some code formatting and coding style issues.
--- a/src/eric7/DebugClients/Python/SubprocessExtension.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/DebugClients/Python/SubprocessExtension.py Fri Mar 08 16:08:43 2024 +0100 @@ -67,9 +67,7 @@ if ok: scriptName = os.path.basename(args[0]) if not _debugClient.skipMultiProcessDebugging(scriptName): - args = patchArguments( - _debugClient, args, noRedirect=True - ) + args = patchArguments(_debugClient, args, noRedirect=True) if "shell" in kwargs and kwargs["shell"] is True: # shell=True interferes with eric debugger kwargs["shell"] = False
--- a/src/eric7/Debugger/StartDialog.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/Debugger/StartDialog.py Fri Mar 08 16:08:43 2024 +0100 @@ -207,9 +207,7 @@ self.scriptnamePicker.setRemote( FileSystemUtilities.isRemoteFileName(scriptName) ) - self.workdirPicker.setRemote( - FileSystemUtilities.isRemoteFileName(scriptName) - ) + self.workdirPicker.setRemote(FileSystemUtilities.isRemoteFileName(scriptName)) if dialogMode == StartDialogMode.Debug: enableMultiprocessGlobal = Preferences.getDebugger("MultiProcessEnabled")
--- a/src/eric7/Graphics/PixmapDiagram.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/Graphics/PixmapDiagram.py Fri Mar 08 16:08:43 2024 +0100 @@ -8,15 +8,7 @@ """ from PyQt6.QtCore import QEvent, QMarginsF, QSize, Qt -from PyQt6.QtGui import ( - QAction, - QColor, - QFont, - QPageLayout, - QPainter, - QPalette, - QPixmap, -) +from PyQt6.QtGui import QAction, QColor, QFont, QPageLayout, QPainter, QPalette, QPixmap from PyQt6.QtPrintSupport import QPrintDialog, QPrinter, QPrintPreviewDialog from PyQt6.QtWidgets import QLabel, QMenu, QScrollArea, QSizePolicy, QToolBar
--- a/src/eric7/Graphics/SvgDiagram.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/Graphics/SvgDiagram.py Fri Mar 08 16:08:43 2024 +0100 @@ -140,7 +140,7 @@ "<p>Reason: {1}</p>" ).format(svgFile, str(err)), ) - + else: self.svgWidget.load(self.svgFile)
--- a/src/eric7/Graphics/UMLDialog.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/Graphics/UMLDialog.py Fri Mar 08 16:08:43 2024 +0100 @@ -298,7 +298,6 @@ ) if not res: return - ##filename = str(fpath) res = self.__writeJsonGraphicsFile(filename)
--- a/src/eric7/HexEdit/HexEditMainWindow.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/HexEdit/HexEditMainWindow.py Fri Mar 08 16:08:43 2024 +0100 @@ -84,7 +84,7 @@ if not self.__fromEric: self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet")) - self.__remotefsInterface =( + self.__remotefsInterface = ( ericApp().getObject("EricServer").getServiceInterface("FileSystem") if self.__fromEric else None @@ -1235,14 +1235,11 @@ return False if ( - ( - FileSystemUtilities.isRemoteFileName(fileName) - and self.__remotefsInterface.exists(fileName) - ) - or ( - FileSystemUtilities.isPlainFileName(fileName) - and pathlib.Path(fileName).exists() - ) + FileSystemUtilities.isRemoteFileName(fileName) + and self.__remotefsInterface.exists(fileName) + ) or ( + FileSystemUtilities.isPlainFileName(fileName) + and pathlib.Path(fileName).exists() ): res = EricMessageBox.yesNo( self,
--- a/src/eric7/IconEditor/IconEditorWindow.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/IconEditor/IconEditorWindow.py Fri Mar 08 16:08:43 2024 +0100 @@ -11,7 +11,15 @@ import os import pathlib -from PyQt6.QtCore import QBuffer, QByteArray, QEvent, QSignalMapper, QSize, Qt, pyqtSignal +from PyQt6.QtCore import ( + QBuffer, + QByteArray, + QEvent, + QSignalMapper, + QSize, + Qt, + pyqtSignal, +) from PyQt6.QtGui import QImage, QImageReader, QImageWriter, QKeySequence, QPalette from PyQt6.QtWidgets import QDockWidget, QLabel, QScrollArea, QWhatsThis
--- a/src/eric7/MicroPython/Devices/__init__.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/MicroPython/Devices/__init__.py Fri Mar 08 16:08:43 2024 +0100 @@ -287,7 +287,6 @@ (0x3343, 0x83CF), # DFRobot Firebeetle 2 ESP32-S3 (0x4097, 0x0001), # TG-Boards Datalore IP M4 (0x612B, 0x80A7), # Ai-Thinker ESP 12k NodeMCU - # do not overwrite this entry (0x239A, None), # Any Adafruit Boards ],
--- a/src/eric7/PdfViewer/PdfViewerWindow.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/PdfViewer/PdfViewerWindow.py Fri Mar 08 16:08:43 2024 +0100 @@ -11,7 +11,16 @@ import os import pathlib -from PyQt6.QtCore import QBuffer, QByteArray, QIODevice, QPointF, QSize, Qt, pyqtSignal, pyqtSlot +from PyQt6.QtCore import ( + QBuffer, + QByteArray, + QIODevice, + QPointF, + QSize, + Qt, + pyqtSignal, + pyqtSlot, +) from PyQt6.QtGui import QAction, QActionGroup, QClipboard, QGuiApplication, QKeySequence from PyQt6.QtPdf import QPdfDocument, QPdfLink from PyQt6.QtPdfWidgets import QPdfView @@ -81,7 +90,7 @@ if not self.__fromEric: self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet")) - self.__remotefsInterface =( + self.__remotefsInterface = ( ericApp().getObject("EricServer").getServiceInterface("FileSystem") if self.__fromEric else None @@ -986,7 +995,7 @@ return else: buffer = None - + while not canceled and err == QPdfDocument.Error.IncorrectPassword: if FileSystemUtilities.isRemoteFileName(fileName): buffer.open(QIODevice.OpenModeFlag.ReadOnly)
--- a/src/eric7/Project/DebuggerPropertiesDialog.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/Project/DebuggerPropertiesDialog.py Fri Mar 08 16:08:43 2024 +0100 @@ -198,33 +198,33 @@ if self.__isRemote: self.project.debugProperties["REMOTEDEBUGGER"] = False else: - self.project.debugProperties[ - "REMOTEDEBUGGER" - ] = self.remoteDebuggerGroup.isChecked() + 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[ - "REMOTEPATH" - ] = self.translationRemoteEdit.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["REMOTEPATH"] = ( + self.translationRemoteEdit.text() + ) self.project.debugProperties["LOCALPATH"] = self.translationLocalEdit.text() if self.__isRemote: self.project.debugProperties["CONSOLEDEBUGGER"] = False else: - self.project.debugProperties[ - "CONSOLEDEBUGGER" - ] = self.consoleDebuggerGroup.isChecked() - self.project.debugProperties[ - "CONSOLECOMMAND" - ] = self.consoleCommandEdit.text() + self.project.debugProperties["CONSOLEDEBUGGER"] = ( + self.consoleDebuggerGroup.isChecked() + ) + self.project.debugProperties["CONSOLECOMMAND"] = ( + self.consoleCommandEdit.text() + ) self.project.debugProperties["REDIRECT"] = ( self.redirectCheckBox.isChecked() or self.__isRemote
--- a/src/eric7/Project/Project.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/Project/Project.py Fri Mar 08 16:08:43 2024 +0100 @@ -1668,9 +1668,8 @@ @return value of the property @rtype Any """ - if ( - key == "INTERPRETER" - and not FileSystemUtilities.isRemoteFileName(self.ppath) + if key == "INTERPRETER" and not FileSystemUtilities.isRemoteFileName( + self.ppath ): return ( ericApp() @@ -2062,9 +2061,11 @@ else os.path.join(target, os.path.basename(fn)) ) if not FileSystemUtilities.samepath( - self.__remotefsInterface.dirname(fn) - if isRemote - else os.path.dirname(fn), + ( + self.__remotefsInterface.dirname(fn) + if isRemote + else os.path.dirname(fn) + ), target, ): try: @@ -2549,9 +2550,11 @@ if entry.startswith(olddn): entry = entry.replace(olddn, newdn) self.appendFile( - self.__remotefsInterface.join(self.ppath, entry) - if isRemote - else os.path.join(self.ppath, entry), + ( + self.__remotefsInterface.join(self.ppath, entry) + if isRemote + else os.path.join(self.ppath, entry) + ), fileCategory == "SOURCES", ) self.setDirty(True) @@ -3320,16 +3323,16 @@ 0 ] ) - self.__pdata[ - "TRANSLATIONPATTERN" - ] = self.__remotefsInterface.join( - self.__remotefsInterface.dirname(tslist[0]), - "{0}_%language%{1}".format( - self.__remotefsInterface.basename(tslist[0]).split("_")[ - 0 - ], - self.__remotefsInterface.splitext(tslist[0])[1], - ), + self.__pdata["TRANSLATIONPATTERN"] = ( + self.__remotefsInterface.join( + self.__remotefsInterface.dirname(tslist[0]), + "{0}_%language%{1}".format( + self.__remotefsInterface.basename(tslist[0]).split( + "_" + )[0], + self.__remotefsInterface.splitext(tslist[0])[1], + ), + ) ) else: mainscriptname = ( @@ -6167,10 +6170,14 @@ act = self.recentMenu.addAction( formatStr.format( idx, - self.__remotefsInterface.compactPath(rp, self.ui.maxMenuFilePathLen) - if FileSystemUtilities.isRemoteFileName(rp) - else FileSystemUtilities.compactPath( - rp, self.ui.maxMenuFilePathLen + ( + self.__remotefsInterface.compactPath( + rp, self.ui.maxMenuFilePathLen + ) + if FileSystemUtilities.isRemoteFileName(rp) + else FileSystemUtilities.compactPath( + rp, self.ui.maxMenuFilePathLen + ) ), ) )
--- a/src/eric7/Project/ProjectBaseBrowser.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/Project/ProjectBaseBrowser.py Fri Mar 08 16:08:43 2024 +0100 @@ -269,9 +269,8 @@ if self.backMenu is not None: self.backMenu.setEnabled(True) - if ( - self.project.vcs is not None - and not FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) + if self.project.vcs is not None and not FileSystemUtilities.isRemoteFileName( + self.project.getProjectPath() ): self.vcsHelper = self.project.vcs.vcsGetProjectBrowserHelper( self, self.project, self.isTranslationsBrowser
--- a/src/eric7/Project/ProjectSourcesBrowser.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/Project/ProjectSourcesBrowser.py Fri Mar 08 16:08:43 2024 +0100 @@ -1127,8 +1127,8 @@ from .NewPythonPackageDialog import NewPythonPackageDialog isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) - remotefsInterface = ericApp().getObject("EricServer").getServiceInterface( - "FileSystem" + remotefsInterface = ( + ericApp().getObject("EricServer").getServiceInterface("FileSystem") ) separator = remotefsInterface.separator() if isRemote else os.sep @@ -1206,8 +1206,8 @@ Private method to add a new source file to the project. """ isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) - remotefsInterface = ericApp().getObject("EricServer").getServiceInterface( - "FileSystem" + remotefsInterface = ( + ericApp().getObject("EricServer").getServiceInterface("FileSystem") ) dn = self.currentDirectory() @@ -1455,8 +1455,8 @@ Private method to handle the imports diagram context menu action. """ isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) - remotefsInterface = ericApp().getObject("EricServer").getServiceInterface( - "FileSystem" + remotefsInterface = ( + ericApp().getObject("EricServer").getServiceInterface("FileSystem") ) itm = self.model().item(self.currentIndex()) @@ -1464,12 +1464,15 @@ fn = itm.fileName() except AttributeError: fn = itm.dirName() - if isRemote: - package = ( - fn if remotefsInterface.isdir(fn) else remotefsInterface.dirname(fn) + package = ( + fn + if remotefsInterface.isdir(fn) + else ( + remotefsInterface.dirname(fn) + if isRemote + else fn if os.path.isdir(fn) else os.path.dirname(fn) ) - else: - package = fn if os.path.isdir(fn) else os.path.dirname(fn) + ) res = EricMessageBox.yesNo( self, self.tr("Imports Diagram"), @@ -1490,8 +1493,8 @@ Private method to handle the package diagram context menu action. """ isRemote = FileSystemUtilities.isRemoteFileName(self.project.getProjectPath()) - remotefsInterface = ericApp().getObject("EricServer").getServiceInterface( - "FileSystem" + remotefsInterface = ( + ericApp().getObject("EricServer").getServiceInterface("FileSystem") ) itm = self.model().item(self.currentIndex()) @@ -1499,12 +1502,15 @@ fn = itm.fileName() except AttributeError: fn = itm.dirName() - if isRemote: - package = ( - fn if remotefsInterface.isdir(fn) else remotefsInterface.dirname(fn) + package = ( + fn + if remotefsInterface.isdir(fn) + else ( + remotefsInterface.dirname(fn) + if isRemote + else fn if os.path.isdir(fn) else os.path.dirname(fn) ) - else: - package = fn if os.path.isdir(fn) else os.path.dirname(fn) + ) res = EricMessageBox.yesNo( self, self.tr("Package Diagram"),
--- a/src/eric7/QScintilla/Editor.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/QScintilla/Editor.py Fri Mar 08 16:08:43 2024 +0100 @@ -3472,7 +3472,6 @@ self.tr("File Modified"), self.tr("<p>The file <b>{0}</b> has unsaved changes.</p>").format(fn), self.saveFile, - ), ) if res: self.vm.setEditorName(self, self.fileName)
--- a/src/eric7/QScintilla/Shell.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/QScintilla/Shell.py Fri Mar 08 16:08:43 2024 +0100 @@ -2135,7 +2135,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)) @@ -2646,7 +2646,7 @@ False, forProject=True, workingDir=ppath, - startRemote=FileSystemUtilities.isRemoteFileName(ppath) + startRemote=FileSystemUtilities.isRemoteFileName(ppath), ) self.__currentWorkingDirectory = self.__project.getProjectPath() self.__getBanner() @@ -2666,12 +2666,12 @@ 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))
--- a/src/eric7/RemoteServer/EricServer.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/RemoteServer/EricServer.py Fri Mar 08 16:08:43 2024 +0100 @@ -202,7 +202,7 @@ return {} jsonStr = data.decode("utf8", "backslashreplace") - print("Eric Server Receive:", jsonStr) # for debugging + print("Eric Server Receive:", jsonStr) # for debugging # noqa: M801 try: return json.loads(jsonStr.strip()) except (TypeError, ValueError) as err: @@ -324,7 +324,6 @@ print(f"'eric-ide' connection from {address[0]}, port {address[1]}") # noqa: M801 self.__connection = connection - ##self.__connection.setblocking(False) data = types.SimpleNamespace( name="eric-ide", address=address, handler=self.__serviceIdeConnection )
--- a/src/eric7/RemoteServer/EricServerDebuggerRequestHandler.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/RemoteServer/EricServerDebuggerRequestHandler.py Fri Mar 08 16:08:43 2024 +0100 @@ -49,7 +49,6 @@ self.__originalPathString = os.getenv("PATH") - def initServerSocket(self): """ Public method to initialize the server socket listening for debug client @@ -178,10 +177,10 @@ self.__server.getSelector().unregister(sock) address = sock.getpeername() - print( + print( # noqa: M801 f"'Debug Client' connection from {address[0]}, port {address[1]} closed." ) - # noqa: M801 + for debuggerId in list(self.__connections): if self.__connections[debuggerId] is sock: del self.__connections[debuggerId]
--- a/src/eric7/RemoteServer/EricServerFileSystemRequestHandler.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/RemoteServer/EricServerFileSystemRequestHandler.py Fri Mar 08 16:08:43 2024 +0100 @@ -165,6 +165,8 @@ @param withHidden flag indicating to list hidden files and directories as well (defaults to False) @type bool (optional) + @return list of file and directory entries + @rtype list of dict """ listing = [] for dirEntry in os.scandir(directory): @@ -185,7 +187,7 @@ ), } listing.append(entry) - + if entry["is_dir"] and recursive: listing += self.__scanDirectory(dirEntry.path, recursive)
--- a/src/eric7/RemoteServerInterface/EricServerFileDialog.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerFileDialog.py Fri Mar 08 16:08:43 2024 +0100 @@ -531,9 +531,8 @@ sizeStr = dataString(dirEntry["size"], QLocale.system()) self.__filenameCache.append(dirEntry["name"]) itm = QTreeWidgetItem( - self.listing, [ - dirEntry["name"], sizeStr, type_, dirEntry["mtime_str"] - ] + self.listing, + [dirEntry["name"], sizeStr, type_, dirEntry["mtime_str"]], ) itm.setIcon(0, EricPixmapCache.getIcon(iconName)) itm.setTextAlignment(1, Qt.AlignmentFlag.AlignRight)
--- a/src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py Fri Mar 08 16:08:43 2024 +0100 @@ -19,7 +19,6 @@ from eric7.RemoteServer.EricRequestCategory import EricRequestCategory from eric7.SystemUtilities import FileSystemUtilities - _RemoteFsCache = {} # dictionary containing cached remote file system data keyed by remote path @@ -83,9 +82,8 @@ @param connected flag indicating a connected state @type bool """ - if connected: - if not bool(self.__serverPathSep): - self.__serverPathSep = self.__getPathSep() + if connected and not bool(self.__serverPathSep): + self.__serverPathSep = self.__getPathSep() def __getPathSep(self): """ @@ -942,12 +940,11 @@ path separator. @rtype tuple of (str, str) """ - if self.__serverPathSep == "\\": - # remote is a Windows system - normp = p.replace("/", "\\") - else: - # remote is a Posix system - normp = p.replace("\\", "/") + normp = ( + p.replace("/", "\\") # remote is a Windows system + if self.__serverPathSep == "\\" + else p.replace("\\", "/") # remote is a Posix system + ) i = normp.rfind(self.__serverPathSep) + 1 head, tail = normp[:i], normp[i:] @@ -1410,12 +1407,12 @@ try: listing = self.listdir(directory=directory, recursive=True)[2] for entry in listing: - _RemoteFsCache[ - FileSystemUtilities.remoteFileName(entry["path"]) - ] = entry + _RemoteFsCache[FileSystemUtilities.remoteFileName(entry["path"])] = ( + entry + ) print(f"Remote Cache Size: {len(_RemoteFsCache)} entries") except OSError as err: - print("error in 'populateFsCache()':", str(err)) + print("Error in 'populateFsCache()':", str(err)) # noqa: M801 def removeFromFsCache(self, directory): """
--- a/src/eric7/Snapshot/SnapWidget.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/Snapshot/SnapWidget.py Fri Mar 08 16:08:43 2024 +0100 @@ -330,7 +330,7 @@ self.mouseCursorCheckBox.isChecked(), self.decorationsCheckBox.isChecked(), ) - + else: EricMessageBox.critical( self,
--- a/src/eric7/UI/UserInterface.py Fri Mar 08 15:51:14 2024 +0100 +++ b/src/eric7/UI/UserInterface.py Fri Mar 08 16:08:43 2024 +0100 @@ -601,9 +601,7 @@ self.shell.remoteConnectionChanged ) - self.__ericServerInterface.aboutToDisconnect.connect( - self.project.closeProject - ) + self.__ericServerInterface.aboutToDisconnect.connect(self.project.closeProject) self.__ericServerInterface.aboutToDisconnect.connect( self.viewmanager.closeRemoteEditors )