Mercurial Repositories > Eric Assistant / file diff

--- a/AssistantEric/APIsManager.py	Wed Sep 21 16:59:53 2022 +0200
+++ b/AssistantEric/APIsManager.py	Mon Oct 24 16:06:28 2022 +0200
@@ -15,14 +15,13 @@
 with contextlib.suppress(ImportError):
     from PyQt6.QtSql import QSqlDatabase, QSqlQuery
 
-from EricWidgets.EricApplication import ericApp
+from eric7 import Globals, Preferences, Utilities
 
-import QScintilla.Lexers
+from eric7.EricWidgets.EricApplication import ericApp
 
-import Globals
-import Utilities.ModuleParser
-import Utilities
-import Preferences
+from eric7.QScintilla import Lexers
+
+from eric7.Utilities import ModuleParser
 
 WorkerStatusStarted = 2001
 WorkerStatusFinished = 2002
@@ -116,8 +115,8 @@
         # supports. This has to be before we create a new thread, because
         # access to GUI elements is not allowed from non-GUI threads.
         self.__wseps = {}
-        for lang in QScintilla.Lexers.getSupportedLanguages():
-            lexer = QScintilla.Lexers.getLexer(lang)
+        for lang in Lexers.getSupportedLanguages():
+            lexer = Lexers.getLexer(lang)
             if lexer is not None:
                 self.__wseps[lang] = lexer.autoCompletionWordSeparators()
 
@@ -217,7 +216,7 @@
             classNameStr = "{0}{1}.".format(moduleName, className)
             for variable in sorted(_class.attributes.keys()):
                 if not _class.attributes[variable].isPrivate():
-                    from QScintilla.Editor import Editor
+                    from eric7.QScintilla.Editor import Editor
 
                     if _class.attributes[variable].isPublic():
                         iconId = Editor.AttributeID
@@ -240,14 +239,14 @@
 
         if self.__language == ApisNameProject:
             with contextlib.suppress(OSError, ImportError):
-                module = Utilities.ModuleParser.readModule(
+                module = ModuleParser.readModule(
                     os.path.join(self.__projectPath, apiFile),
                     basename=self.__projectPath + os.sep,
                     caching=False,
                 )
                 language = module.getType()
                 if language:
-                    from DocumentationTools.APIGenerator import APIGenerator
+                    from eric7.DocumentationTools.APIGenerator import APIGenerator
 
                     apiGenerator = APIGenerator(module)
                     apis = apiGenerator.genAPI(True, "", True)
@@ -711,7 +710,7 @@
             self.__discardFirst = ["self", "cls"]
         else:
             self.__discardFirst = []
-        self.__lexer = QScintilla.Lexers.getLexer(self.__language)
+        self.__lexer = Lexers.getLexer(self.__language)
         try:
             self.__apifiles = Preferences.getEditorAPI(
                 self.__language, projectType=self.__projectType
@@ -1236,7 +1235,7 @@
             self.__discardFirst = ["self", "cls"]
         else:
             self.__discardFirst = []
-        self.__lexer = QScintilla.Lexers.getLexer(self.__project.getProjectLanguage())
+        self.__lexer = Lexers.getLexer(self.__project.getProjectLanguage())
         self.__openAPIs()
 
     def __projectClosed(self):
@@ -1324,7 +1323,7 @@
             return self.__apis[(language, projectType)]
         except KeyError:
             if (
-                language in QScintilla.Lexers.getSupportedApiLanguages()
+                language in Lexers.getSupportedApiLanguages()
                 or language == ApisNameProject
             ):
                 # create the api object