Mercurial Repositories > eric / file diff

diff -r b7ebfc2e47d4 -r 59579e8aff98 src/eric7/MultiProject/MultiProject.py
--- a/src/eric7/MultiProject/MultiProject.py	Mon Feb 19 19:17:04 2024 +0100
+++ b/src/eric7/MultiProject/MultiProject.py	Wed Feb 21 10:56:24 2024 +0100
@@ -12,7 +12,7 @@
 import pathlib
 import shutil
 
-from PyQt6.QtCore import QFile, QIODevice, QObject, QUuid, pyqtSignal, pyqtSlot
+from PyQt6.QtCore import QObject, QUuid, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QMenu, QToolBar
 
 from eric7 import Preferences
@@ -21,7 +21,6 @@
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricFileDialog, EricMessageBox, EricPathPickerDialog
 from eric7.EricWidgets.EricPathPickerDialog import EricPathPickerModes
-from eric7.EricXML.MultiProjectReader import MultiProjectReader
 from eric7.Globals import recentNameMultiProject
 from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
 
@@ -201,35 +200,15 @@
 
     def __readMultiProject(self, fn):
         """
-        Private method to read in a multi project (.emj, .e4m, .e5m) file.
+        Private method to read in a multi project (.emj) file.
 
         @param fn filename of the multi project file to be read
         @type str
         @return flag indicating success
         @rtype bool
         """
-        if os.path.splitext(fn)[1] == ".emj":
-            # new JSON based format
-            with EricOverrideCursor():
-                res = self.__multiProjectFile.readFile(fn)
-        else:
-            # old XML based format
-            f = QFile(fn)
-            if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                with EricOverrideCursor():
-                    reader = MultiProjectReader(f, self)
-                    reader.readXML()
-                    f.close()
-                res = not reader.hasError()
-            else:
-                EricMessageBox.critical(
-                    self.ui,
-                    self.tr("Read Multi Project File"),
-                    self.tr(
-                        "<p>The multi project file <b>{0}</b> could not be read.</p>"
-                    ).format(fn),
-                )
-                res = False
+        with EricOverrideCursor():
+            res = self.__multiProjectFile.readFile(fn)
 
         if res:
             self.pfile = os.path.abspath(fn)
@@ -519,10 +498,7 @@
                 self.parent(),
                 self.tr("Open Multi Project"),
                 Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir(),
-                self.tr(
-                    "Multi Project Files (*.emj);;"
-                    "XML Multi Project Files (*.e5m *.e4m)"
-                ),
+                self.tr("Multi Project Files (*.emj)"),
             )
 
             if fn == "":
@@ -553,11 +529,6 @@
         """
         if self.isDirty():
             if len(self.pfile) > 0:
-                if self.pfile.endswith((".e4m", ".e5m")):
-                    self.pfile = self.pfile.replace(".e4m", ".emj").replace(
-                        ".e5m", ".emj"
-                    )
-                    self.__syncRecent()
                 ok = self.__writeMultiProject()
             else:
                 ok = self.saveMultiProjectAs()