diff -r 71f50b4cc169 -r f57b151c9761 AssistantEric/Assistant.py --- a/AssistantEric/Assistant.py Wed Jan 02 10:52:45 2013 +0100 +++ b/AssistantEric/Assistant.py Sat Feb 23 15:07:44 2013 +0100 @@ -17,10 +17,7 @@ from .APIsManager import APIsManager, ApisNameProject -from QScintilla.Editor import Editor - import Preferences -from Utilities.ModuleParser import Module AcsAPIs = 0x0001 AcsDocument = 0x0002 @@ -54,6 +51,7 @@ self.__lastContext = None self.__lastFullContext = None + from QScintilla.Editor import Editor self.__fromDocumentID = Editor.FromDocumentID def activate(self): @@ -309,6 +307,7 @@ col -= 1 prefix = editor.getWordLeft(line, col) if editor.isPy2File() or editor.isPy3File(): + from Utilities.ModuleParser import Module src = editor.text() fn = editor.getFileName() if fn is None: @@ -508,6 +507,8 @@ prefixFound = False if prefix and module: + from QScintilla.Editor import Editor + line, col = editor.getCursorPosition() if prefix in ["cls", "self"]: prefixFound = True @@ -715,6 +716,7 @@ col -= 1 prefix = editor.getWordLeft(line, col) if editor.isPy2File() or editor.isPy3File(): + from Utilities.ModuleParser import Module src = editor.text() fn = editor.getFileName() if fn is None: