diff -r 8c5296fe3056 -r 8a68afaf1ba2 eric7/Project/Project.py
--- a/eric7/Project/Project.py Wed Jun 15 09:44:07 2022 +0200
+++ b/eric7/Project/Project.py Thu Jun 16 18:28:59 2022 +0200
@@ -15,10 +15,11 @@
import copy
import zipfile
import contextlib
+import pathlib
from PyQt6.QtCore import (
- pyqtSlot, QFile, QFileInfo, pyqtSignal, QCryptographicHash, QIODevice,
- QByteArray, QObject, QProcess
+ pyqtSlot, QFile, pyqtSignal, QCryptographicHash, QIODevice, QByteArray,
+ QObject, QProcess
)
from PyQt6.QtGui import QKeySequence, QAction
from PyQt6.QtWidgets import (
@@ -692,7 +693,7 @@
rp = Preferences.Prefs.rsettings.value(recentNameProject)
if rp is not None:
for f in rp:
- if QFileInfo(f).exists():
+ if pathlib.Path(f).exists():
self.recent.append(f)
def __saveRecent(self):
@@ -3129,23 +3130,23 @@
EricFileDialog.DontConfirmOverwrite)
if fn:
- ext = QFileInfo(fn).suffix()
- if not ext:
+ fpath = pathlib.Path(fn)
+ if not fpath.suffix:
ex = selectedFilter.split("(*")[1].split(")")[0]
if ex:
- fn += ex
- if QFileInfo(fn).exists():
+ fpath = fpath.with_suffix(ex)
+ if fpath.exists():
res = EricMessageBox.yesNo(
self.ui,
self.tr("Save File"),
self.tr("""<p>The file <b>{0}</b> already exists."""
- """ Overwrite it?</p>""").format(fn),
+ """ Overwrite it?</p>""").format(str(fpath)),
icon=EricMessageBox.Warning)
if not res:
return False
- self.name = QFileInfo(fn).baseName()
- ok = self.__writeProject(fn)
+ self.name = fpath.stem()
+ ok = self.__writeProject(str(fpath))
if ok:
# create management directory if not present
@@ -4647,7 +4648,7 @@
idx,
Utilities.compactPath(rp, self.ui.maxMenuFilePathLen)))
act.setData(rp)
- act.setEnabled(QFileInfo(rp).exists())
+ act.setEnabled(pathlib.Path(rp).exists())
self.recentMenu.addSeparator()
self.recentMenu.addAction(self.tr('&Clear'), self.clearRecent)
