Mercurial Repositories > eric / file diff

--- a/src/eric7/QScintilla/Editor.py	Sat Aug 31 10:54:50 2024 +0200
+++ b/src/eric7/QScintilla/Editor.py	Tue Oct 01 11:27:52 2024 +0200
@@ -57,7 +57,7 @@
     QToolTip,
 )
 
-from eric7 import EricUtilities, Globals, Preferences, Utilities
+from eric7 import EricUtilities, Preferences, Utilities
 from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
 from eric7.CodeFormatting.BlackUtilities import aboutBlack
 from eric7.CodeFormatting.IsortFormattingAction import IsortFormattingAction
@@ -467,6 +467,10 @@
                         ]
                         // 1024
                     )
+                elif FileSystemUtilities.isDeviceFileName(self.fileName):
+                    fileIsRemote = False
+                    fileExists = False
+                    fileSizeKB = 0
                 else:
                     fileIsRemote = False
                     fileExists = pathlib.Path(self.fileName).exists()
@@ -7395,7 +7399,7 @@
         regExp = re.compile(
             "|".join(Editor.VcsConflictMarkerLineRegExpList), re.MULTILINE
         )
-        matches = [m for m in regExp.finditer(self.text())]
+        matches = list(regExp.finditer(self.text()))
         for match in matches:
             line, _ = self.lineIndexFromPosition(match.start())
             conflictMarkerLines.append(line)
@@ -7864,7 +7868,7 @@
         """
         Public method to load a macro from a file.
         """
-        configDir = Globals.getConfigDir()
+        configDir = EricUtilities.getConfigDir()
         fname = EricFileDialog.getOpenFileName(
             self,
             self.tr("Load macro file"),
@@ -7903,7 +7907,7 @@
         """
         Public method to save a macro to a file.
         """
-        configDir = Globals.getConfigDir()
+        configDir = EricUtilities.getConfigDir()
 
         name, ok = self.__getMacroName()
         if not ok or not name:
@@ -9631,7 +9635,7 @@
         regExp = re.compile(r"\b{0}\b".format(word))
         startPos = wordEndPos if forward else wordStartPos
 
-        matches = [m for m in regExp.finditer(self.text())]
+        matches = list(regExp.finditer(self.text()))
         if matches:
             if forward:
                 matchesAfter = [m for m in matches if m.start() >= startPos]