Mercurial Repositories > eric / file diff

--- a/src/eric7/UI/UserInterface.py	Mon Feb 19 19:17:04 2024 +0100
+++ b/src/eric7/UI/UserInterface.py	Wed Feb 21 10:56:24 2024 +0100
@@ -24,8 +24,6 @@
 from PyQt6.QtCore import (
     PYQT_VERSION_STR,
     QDate,
-    QFile,
-    QIODevice,
     QObject,
     QProcess,
     QSize,
@@ -73,8 +71,6 @@
 from eric7.EricWidgets.EricSingleApplication import EricSingleApplicationServer
 from eric7.EricWidgets.EricToolBarManager import EricToolBarManager
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-from eric7.EricXML.SessionReader import SessionReader
-from eric7.EricXML.TasksReader import TasksReader
 from eric7.Globals import getConfig
 from eric7.MultiProject.MultiProject import MultiProject
 from eric7.PipInterface.Pip import Pip
@@ -1660,10 +1656,10 @@
             except IndexError:
                 ext = ""
 
-            if ext in (".epj", ".e4p"):
+            if ext in (".epj",):
                 self.project.openProject(filename)
                 opens += 1
-            elif ext in (".emj", ".e4m", ".e5m"):
+            elif ext in (".emj",):
                 self.multiProject.openMultiProject(filename)
                 opens += 1
             else:
@@ -7452,9 +7448,7 @@
             None,
             self.tr("Import Keyboard Shortcuts"),
             "",
-            self.tr(
-                "Keyboard Shortcuts File (*.ekj);;XML Keyboard shortcut file (*.e4k)"
-            ),
+            self.tr("Keyboard Shortcuts File (*.ekj)"),
         )
 
         if fn:
@@ -7620,29 +7614,11 @@
 
     def __readTasks(self):
         """
-        Private slot to read in the tasks file (.etj or .e6t).
+        Private slot to read in the tasks file (.etj).
         """
         fn = os.path.join(Globals.getConfigDir(), "eric7tasks.etj")
         if os.path.exists(fn):
-            # try new style JSON file first
             self.__tasksFile.readFile(fn)
-        else:
-            # try old style XML file second
-            fn = os.path.join(Globals.getConfigDir(), "eric7tasks.e6t")
-            if os.path.exists(fn):
-                f = QFile(fn)
-                if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                    reader = TasksReader(f, viewer=self.taskViewer)
-                    reader.readXML()
-                    f.close()
-                else:
-                    EricMessageBox.critical(
-                        self,
-                        self.tr("Read Tasks"),
-                        self.tr(
-                            "<p>The tasks file <b>{0}</b> could not be read.</p>"
-                        ).format(fn),
-                    )
 
     def __writeSession(self, filename="", crashSession=False):
         """
@@ -7666,7 +7642,7 @@
 
     def __readSession(self, filename=""):
         """
-        Private slot to read in the session file (.esj or .e5s).
+        Private slot to read in the session file (.esj).
 
         @param filename name of a session file to read
         @type str
@@ -7678,42 +7654,20 @@
         else:
             fn = os.path.join(Globals.getConfigDir(), "eric7session.esj")
             if not os.path.exists(fn):
-                fn = os.path.join(Globals.getConfigDir(), "eric7session.e5s")
-                if not os.path.exists(fn):
-                    EricMessageBox.critical(
-                        self,
-                        self.tr("Read Session"),
-                        self.tr(
-                            "<p>The session file <b>{0}</b> could not be read.</p>"
-                        ).format(fn),
-                    )
-                    fn = ""
+                EricMessageBox.critical(
+                    self,
+                    self.tr("Read Session"),
+                    self.tr(
+                        "<p>The session file <b>{0}</b> could not be read.</p>"
+                    ).format(fn),
+                )
+                fn = ""
 
         res = False
         if fn:
-            if fn.endswith(".esj"):
-                # new JSON based format
-                self.__readingSession = True
-                res = self.__sessionFile.readFile(fn)
-                self.__readingSession = False
-            else:
-                # old XML based format
-                f = QFile(fn)
-                if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                    self.__readingSession = True
-                    reader = SessionReader(f, True)
-                    reader.readXML()
-                    self.__readingSession = False
-                    f.close()
-                    res = True
-                else:
-                    EricMessageBox.critical(
-                        self,
-                        self.tr("Read session"),
-                        self.tr(
-                            "<p>The session file <b>{0}</b> could not be read.</p>"
-                        ).format(fn),
-                    )
+            self.__readingSession = True
+            res = self.__sessionFile.readFile(fn)
+            self.__readingSession = False
 
         # Write a crash session after a session was read.
         self.__writeCrashSession()
@@ -7751,7 +7705,7 @@
             self,
             self.tr("Load session"),
             OSUtilities.getHomeDir(),
-            self.tr("eric Session Files (*.esj);;eric XML Session Files (*.e5s)"),
+            self.tr("eric Session Files (*.esj)"),
         )
 
         if not sessionFile:
@@ -7763,11 +7717,10 @@
         """
         Private slot to delete the crash session file.
         """
-        for ext in (".esj", ".e5s"):
-            fn = os.path.join(Globals.getConfigDir(), f"eric7_crash_session{ext}")
-            if os.path.exists(fn):
-                with contextlib.suppress(OSError):
-                    os.remove(fn)
+        fn = os.path.join(Globals.getConfigDir(), "eric7_crash_session.esj")
+        if os.path.exists(fn):
+            with contextlib.suppress(OSError):
+                os.remove(fn)
 
     def __writeCrashSession(self):
         """