--- a/src/eric7/Plugins/PluginVcsSubversion.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/Plugins/PluginVcsSubversion.py Tue Oct 18 16:06:21 2022 +0200 @@ -12,22 +12,24 @@ from PyQt6.QtCore import QObject, QCoreApplication -from EricWidgets.EricApplication import ericApp +from eric7.EricWidgets.EricApplication import ericApp -import Preferences -from Preferences.Shortcuts import readShortcuts +from eric7 import Preferences, Utilities +from eric7.Preferences.Shortcuts import readShortcuts -from VcsPlugins.vcsSubversion.SvnUtilities import getConfigPath, getServersPath +from eric7.Plugins.VcsPlugins.vcsSubversion.SvnUtilities import ( + getConfigPath, + getServersPath, +) -import Utilities -import UI.Info +from eric7.UI import Info # Start-Of-Header name = "Subversion Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = False deactivateable = True -version = UI.Info.VersionOnly +version = Info.VersionOnly pluginType = "version_control" pluginTypename = "Subversion" className = "VcsSubversionPlugin" @@ -111,7 +113,10 @@ @return reference to the configuration page """ global subversionCfgPluginObject - from VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage import SubversionPage + from eric7.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage import ( + # __IGNORE_WARNING__ + SubversionPage, + ) if subversionCfgPluginObject is None: subversionCfgPluginObject = VcsSubversionPlugin(None) @@ -166,7 +171,9 @@ "LogLimit": 20, } - from VcsPlugins.vcsSubversion.ProjectHelper import SvnProjectHelper + from eric7.Plugins.VcsPlugins.vcsSubversion.ProjectHelper import ( + SvnProjectHelper, + ) self.__projectHelperObject = SvnProjectHelper(None, None) with contextlib.suppress(KeyError): @@ -201,7 +208,7 @@ @return tuple of reference to instantiated viewmanager and activation status (boolean) """ - from VcsPlugins.vcsSubversion.subversion import Subversion + from eric7.Plugins.VcsPlugins.vcsSubversion.subversion import Subversion self.__object = Subversion(self, self.__ui)