diff -r 8c5296fe3056 -r 8a68afaf1ba2 eric7/MultiProject/MultiProject.py
--- a/eric7/MultiProject/MultiProject.py Wed Jun 15 09:44:07 2022 +0200
+++ b/eric7/MultiProject/MultiProject.py Thu Jun 16 18:28:59 2022 +0200
@@ -10,9 +10,10 @@
import os
import shutil
import contextlib
+import pathlib
from PyQt6.QtCore import (
- pyqtSignal, pyqtSlot, QFileInfo, QFile, QIODevice, QObject, QUuid
+ pyqtSignal, pyqtSlot, QFile, QIODevice, QObject, QUuid
)
from PyQt6.QtWidgets import QMenu, QDialog, QToolBar
@@ -117,7 +118,7 @@
rp = Preferences.Prefs.rsettings.value(recentNameMultiProject)
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):
@@ -608,12 +609,12 @@
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.parent(),
self.tr("Save File"),
@@ -623,8 +624,8 @@
if not res:
return False
- self.name = QFileInfo(fn).baseName()
- self.__writeMultiProject(fn)
+ self.name = fpath.stem()
+ self.__writeMultiProject(str(fpath))
self.multiProjectClosed.emit()
self.multiProjectOpened.emit()
@@ -894,7 +895,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)
