diff -r 0b936ff1bbb9 -r a2bc06a54d9d src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py --- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py Sun Nov 06 11:22:39 2022 +0100 +++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py Mon Nov 07 17:19:58 2022 +0100 @@ -14,8 +14,11 @@ import os import sys -sys.path.insert(1, os.path.join(os.path.dirname(__file__), "..", "..", "..", "..")) -# four times up is the eric7 package directory +sys.path.insert( + 1, + os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", ".."), +) +# five times up is our installation directory for arg in sys.argv[:]: if arg.startswith("--config="): @@ -51,11 +54,15 @@ if len(argv) > 1: fileName = os.path.basename(argv[1]) if fileName.startswith("hg-histedit-"): - from HgHisteditPlanEditor import HgHisteditPlanEditor + from HgHisteditPlanEditor import ( # __IGNORE_WARNING_I10__ + HgHisteditPlanEditor, + ) return HgHisteditPlanEditor(argv[1]) elif fileName.startswith("hg-editor-"): - from HgHisteditCommitEditor import HgHisteditCommitEditor + from HgHisteditCommitEditor import ( # __IGNORE_WARNING_I10__ + HgHisteditCommitEditor, + ) return HgHisteditCommitEditor(argv[1])