Mercurial Repositories > eric / changeset

--- a/eric7/Globals/__init__.py	Sat Jul 17 15:15:03 2021 +0200
+++ b/eric7/Globals/__init__.py	Sat Jul 17 15:42:09 2021 +0200
@@ -14,7 +14,6 @@
 import sys
 import os
 import re
-import shutil
 import contextlib
 
 from PyQt6.QtCore import (
@@ -204,18 +203,6 @@
         hp = configDir
     else:
         cdn = ".eric7"
-        if isWindowsPlatform():
-            # migrate the old config directory (< v18.06)
-            cdnOld = "_eric7"
-            hpOld = os.path.join(os.path.expanduser("~"), cdnOld)
-            if os.path.exists(hpOld):
-                hpNew = os.path.join(os.path.expanduser("~"), cdn)
-                if os.path.exists(hpNew):
-                    # simply delete the old config directory
-                    shutil.rmtree(hpOld, True)
-                else:
-                    os.rename(hpOld, hpNew)
-        
         hp = os.path.join(os.path.expanduser("~"), cdn)
         if not os.path.exists(hp):
             os.mkdir(hp)

--- a/eric7/Utilities/BackgroundClient.py	Sat Jul 17 15:15:03 2021 +0200
+++ b/eric7/Utilities/BackgroundClient.py	Sat Jul 17 15:42:09 2021 +0200
@@ -178,12 +178,8 @@
                 elif fx.startswith("batch_"):
                     callback = self.batchServices.get(fx)
                     if callback:
-                        try:
-                            callback(data, self.__send, fx, self.__cancelled,
-                                     maxProcesses=self.__maxProcs)
-                        except TypeError:
-                            # for backward compatibility
-                            callback(data, self.__send, fx, self.__cancelled)
+                        callback(data, self.__send, fx, self.__cancelled,
+                                 maxProcesses=self.__maxProcs)
                         ret = "__DONE__"
                     else:
                         ret = 'Unknown batch service.'

--- a/eric7/VCS/ProjectBrowserHelper.py	Sat Jul 17 15:15:03 2021 +0200
+++ b/eric7/VCS/ProjectBrowserHelper.py	Sat Jul 17 15:42:09 2021 +0200
@@ -313,14 +313,6 @@
                 else:
                     self.browser._removeFile()  # remove file(s) from project
         
-    def _VCSLog(self):
-        """
-        Protected slot called by the context menu to show the VCS log of a
-        file/directory.
-        """
-        # kept for backward compatibility for plug-ins
-        self._VCSLogBrowser()
-    
     def _VCSLogBrowser(self):
         """
         Protected slot called by the context menu to show the log browser for a

--- a/eric7/VCS/ProjectHelper.py	Sat Jul 17 15:15:03 2021 +0200
+++ b/eric7/VCS/ProjectHelper.py	Sat Jul 17 15:42:09 2021 +0200
@@ -544,13 +544,6 @@
                 self.vcs.vcsSetOptions(codlg.getOptions())
                 self.project.setDirty(True)
         
-    def _vcsLog(self):
-        """
-        Protected slot used to show the log of the local project.
-        """
-        # kept for backward compatibility for plug-ins
-        self._vcsLogBrowser()
-        
     def _vcsLogBrowser(self):
         """
         Protected slot used to show the log of the local project with a