--- a/src/eric7/Plugins/PluginVcsGit.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/Plugins/PluginVcsGit.py Tue Oct 18 16:06:21 2022 +0200 @@ -12,22 +12,22 @@ from PyQt6.QtCore import QObject, QCoreApplication, QByteArray -from EricWidgets.EricApplication import ericApp +from eric7.EricWidgets.EricApplication import ericApp -import Preferences -from Preferences.Shortcuts import readShortcuts +from eric7 import Preferences, Utilities -from VcsPlugins.vcsGit.GitUtilities import getConfigPath +from eric7.Preferences.Shortcuts import readShortcuts -import Utilities -import UI.Info +from eric7.Plugins.VcsPlugins.vcsGit.GitUtilities import getConfigPath + +from eric7.UI import Info # Start-Of-Header name = "Git Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = False deactivateable = True -version = UI.Info.VersionOnly +version = Info.VersionOnly pluginType = "version_control" pluginTypename = "Git" className = "VcsGitPlugin" @@ -109,7 +109,7 @@ @return reference to the configuration page """ global gitCfgPluginObject - from VcsPlugins.vcsGit.ConfigurationPage.GitPage import GitPage + from eric7.Plugins.VcsPlugins.vcsGit.ConfigurationPage.GitPage import GitPage if gitCfgPluginObject is None: gitCfgPluginObject = VcsGitPlugin(None) @@ -188,7 +188,7 @@ super().__init__(ui) self.__ui = ui - from VcsPlugins.vcsGit.ProjectHelper import GitProjectHelper + from eric7.Plugins.VcsPlugins.vcsGit.ProjectHelper import GitProjectHelper self.__projectHelperObject = GitProjectHelper(None, None) with contextlib.suppress(KeyError): @@ -224,7 +224,7 @@ @return tuple of reference to instantiated viewmanager and activation status (boolean) """ - from VcsPlugins.vcsGit.git import Git + from eric7.Plugins.VcsPlugins.vcsGit.git import Git self.__object = Git(self, self.__ui)