diff -r cceb9aa09bbc -r 933b8fcd854f RefactoringRope/CodeAssistServer.py --- a/RefactoringRope/CodeAssistServer.py Mon Oct 17 16:45:55 2022 +0200 +++ b/RefactoringRope/CodeAssistServer.py Mon Oct 24 19:31:03 2022 +0200 @@ -15,15 +15,11 @@ from PyQt6.QtCore import pyqtSlot, QCoreApplication, QTimer -from EricWidgets.EricApplication import ericApp -from EricWidgets import EricMessageBox - -from EricNetwork.EricJsonServer import EricJsonServer - -from QScintilla.Editor import Editor - -import Globals -import Preferences +from eric7 import Globals, Preferences +from eric7.EricNetwork.EricJsonServer import EricJsonServer +from eric7.EricWidgets.EricApplication import ericApp +from eric7.EricWidgets import EricMessageBox +from eric7.QScintilla.Editor import Editor class CodeAssistServer(EricJsonServer): @@ -211,7 +207,7 @@ configfile = self.__ropeConfigFile(idString) if configfile: if os.path.exists(configfile): - from QScintilla.MiniEditor import MiniEditor + from eric7.QScintilla.MiniEditor import MiniEditor editor = MiniEditor(configfile) editor.show() @@ -595,7 +591,7 @@ @type dict """ with contextlib.suppress(ImportError): - from QScintilla.Editor import ReferenceItem + from eric7.QScintilla.Editor import ReferenceItem if "Error" not in result: # ignore errors silently