eric: comparison eric7/QScintilla/Editor.py

-:bd90cbe0b7d2
+:a763d57e23bc
 import bisect
 import collections
 import contextlib
 import difflib
 import os
+import pathlib
 import re
 import editorconfig
 from PyQt6.QtCore import (
-pyqtSignal, pyqtSlot, Qt, QDir, QTimer, QModelIndex, QFileInfo,
+pyqtSignal, pyqtSlot, Qt, QDir, QTimer, QModelIndex, QCryptographicHash,
-QCryptographicHash, QEvent, QDateTime, QPoint, QSize
+QEvent, QDateTime, QPoint, QSize
 )
 from PyQt6.QtGui import QPalette, QFont, QPixmap, QPainter, QActionGroup
 from PyQt6.QtWidgets import (
 QLineEdit, QDialog, QInputDialog, QApplication, QMenu
 )
 self.isResourcesFile = False
 if editor is None:
 if self.fileName:
 if (
-(QFileInfo(self.fileName).size() // 1024) >
+(pathlib.Path(self.fileName).stat().st_size // 1024) >
 Preferences.getEditor("WarnFilesize")
 ):
 res = EricMessageBox.yesNo(
 self,
 self.tr("Open File"),
 self.tr("""<p>The size of the file <b>{0}</b>"""
 """ is <b>{1} KB</b>."""
 """ Do you really want to load it?</p>""")
-.format(self.fileName,
+.format(
-QFileInfo(self.fileName).size() // 1024),
+self.fileName,
+pathlib.Path(self.fileName).stat().st_size // 1024
+),
 icon=EricMessageBox.Warning)
 if not res:
 raise OSError()
 self.readFile(self.fileName, True)
 self.__bindLexer(self.fileName)
 m and self.
 @param m modification status
 """
 if not m and bool(self.fileName):
-self.lastModified = QFileInfo(self.fileName).lastModified()
+self.lastModified = pathlib.Path(self.fileName).stat().st_mtime
 self.modificationStatusChanged.emit(m, self)
 self.undoAvailable.emit(self.isUndoAvailable())
 self.redoAvailable.emit(self.isRedoAvailable())
 def __cursorPositionChanged(self, line, index):
 self.setEolModeByEolString(fileEol)
 self.extractTasks()
 self.setModified(modified)
-self.lastModified = QFileInfo(self.fileName).lastModified()
+self.lastModified = pathlib.Path(fn).stat().st_mtime
 def __convertTabs(self):
 """
 Private slot to convert tabulators to spaces.
 """
 if fn:
 if fn.endswith("."):
 fn = fn[:-1]
-ext = QFileInfo(fn).suffix()
+fpath = pathlib.Path(fn)
-if not ext:
+if not fpath.suffix:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
-fn += ex
+fpath = fpath.with_suffix(ex)
-if QFileInfo(fn).exists():
+if fpath.exists():
 res = EricMessageBox.yesNo(
 self,
 self.tr("Save File"),
 self.tr("<p>The file <b>{0}</b> already exists."
-" Overwrite it?</p>").format(fn),
+" Overwrite it?</p>").format(fpath),
 icon=EricMessageBox.Warning)
 if not res:
 return ""
-fn = Utilities.toNativeSeparators(fn)
+return str(fpath)
-return fn
 def saveFileCopy(self, path=None):
 """
 Public method to save a copy of the file.
 self.project.appendFile(fn)
 self.addedToProject()
 self.setLanguage(self.fileName)
-self.lastModified = QFileInfo(self.fileName).lastModified()
+self.lastModified = pathlib.Path(fn).stat().st_mtime
 if newName is not None:
 self.vm.addToRecentList(newName)
 self.editorSaved.emit(self.fileName)
 self.checkSyntax()
 self.extractTasks()
 self.__resetOnlineChangeTraceInfo()
 self.__checkEncoding()
 return True
 else:
-self.lastModified = QFileInfo(fn).lastModified()
+self.lastModified = pathlib.Path(fn).stat().st_mtime
 return False
 def saveFileAs(self, path=None, toProject=False):
 """
 Public slot to save a file with a new name.
 self.__loadEditorConfig()
 if self.lexer_ is None:
 self.setLanguage(self.fileName)
-self.lastModified = QFileInfo(self.fileName).lastModified()
+self.lastModified = pathlib.Path(fn).stat().st_mtime
 self.vm.setEditorName(self, self.fileName)
 self.__updateReadOnly(True)
 def fileRenamed(self, fn):
 """
 EricFileDialog.DontConfirmOverwrite)
 if not fname:
 return  # user aborted
-ext = QFileInfo(fname).suffix()
+fpath = pathlib.Path(fname)
-if not ext:
+if not fpath.suffix:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
-fname += ex
+fpath = fpath.with_suffix(ex)
-if QFileInfo(fname).exists():
+if fpath.exists():
 res = EricMessageBox.yesNo(
 self,
 self.tr("Save macro"),
 self.tr("<p>The macro file <b>{0}</b> already exists."
-" Overwrite it?</p>").format(fname),
+" Overwrite it?</p>").format(fpath),
 icon=EricMessageBox.Warning)
 if not res:
 return
-fname = Utilities.toNativeSeparators(fname)
 try:
-with open(fname, "w", encoding="utf-8") as f:
+with fpath.open("w", encoding="utf-8") as f:
 f.write("{0}{1}".format(name, "\n"))
 f.write(self.macros[name].save())
 except OSError:
 EricMessageBox.critical(
 self,
 self.tr("Error saving macro"),
 self.tr(
 "<p>The macro file <b>{0}</b> could not be written.</p>")
-.format(fname))
+.format(fpath))
 return
 def macroRecordingStart(self):
 """
 Public method to start macro recording.
 self.setCaretWidth(self.caretWidth)
 self.__updateReadOnly(False)
 if (
 self.vm.editorsCheckFocusInEnabled() and
 not self.inReopenPrompt and self.fileName and
-QFileInfo(self.fileName).lastModified().toString() !=
+pathlib.Path(self.fileName).stat().st_mtime != self.lastModified
-self.lastModified.toString()
 ):
 self.inReopenPrompt = True
 if Preferences.getEditor("AutoReopen") and not self.isModified():
 self.refresh()
 else:
 yesDefault=yesDefault)
 if res:
 self.refresh()
 else:
 # do not prompt for this change again...
-self.lastModified = QFileInfo(self.fileName).lastModified()
+self.lastModified = (
+pathlib.Path(self.fileName).stat().st_mtime
+)
 self.inReopenPrompt = False
 self.setCursorFlashTime(QApplication.cursorFlashTime())
 super().focusInEvent(event)
 """
 if self.fileName == "":
 return
 readOnly = (
-not QFileInfo(self.fileName).isWritable() or
+not os.access(self.fileName, os.W_OK) or
 self.isReadOnly()
 )
 if not bForce and (readOnly == self.isReadOnly()):
 return
 """
 if event.mimeData().hasUrls():
 for url in event.mimeData().urls():
 fname = url.toLocalFile()
 if fname:
-if not QFileInfo(fname).isDir():
+if not pathlib.Path(fname).is_dir():
 self.vm.openSourceFile(fname)
 else:
 EricMessageBox.information(
 self,
 self.tr("Drop Error"),

Mercurial Repositories > eric / file comparison

comparison: eric7/QScintilla/Editor.py

eric7/QScintilla/Editor.py