diff -r 45e7bb09c120 -r 80c06d472826 src/eric7/Plugins/PluginVcsMercurial.py --- a/src/eric7/Plugins/PluginVcsMercurial.py Tue Oct 18 16:05:20 2022 +0200 +++ b/src/eric7/Plugins/PluginVcsMercurial.py Tue Oct 18 16:06:21 2022 +0200 @@ -12,22 +12,25 @@ 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 eric7.Preferences.Shortcuts import readShortcuts -from VcsPlugins.vcsMercurial.HgUtilities import getConfigPath, getHgExecutable +from eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities import ( + getConfigPath, + getHgExecutable, +) -import Utilities -import UI.Info +from eric7.UI import Info # Start-Of-Header name = "Mercurial Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" autoactivate = False deactivateable = True -version = UI.Info.VersionOnly +version = Info.VersionOnly pluginType = "version_control" pluginTypename = "Mercurial" className = "VcsMercurialPlugin" @@ -103,7 +106,9 @@ @return reference to the configuration page """ global mercurialCfgPluginObject - from VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage import MercurialPage + from eric7.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage import ( + MercurialPage, + ) if mercurialCfgPluginObject is None: mercurialCfgPluginObject = VcsMercurialPlugin(None) @@ -190,7 +195,7 @@ super().__init__(ui) self.__ui = ui - from VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper + from eric7.Plugins.VcsPlugins.vcsMercurial.ProjectHelper import HgProjectHelper self.__projectHelperObject = HgProjectHelper(None, None) with contextlib.suppress(KeyError): @@ -225,7 +230,7 @@ @return tuple of reference to instantiated viewmanager and activation status (boolean) """ - from VcsPlugins.vcsMercurial.hg import Hg + from eric7.Plugins.VcsPlugins.vcsMercurial.hg import Hg self.__object = Hg(self, self.__ui)