[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited AbstractASTManager
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2006-05-16 12:35:17
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12925/src/org/python/pydev/editor/codecompletion/revisited Modified Files: AbstractASTManager.java Log Message: Index: AbstractASTManager.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/AbstractASTManager.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** AbstractASTManager.java 4 May 2006 12:23:38 -0000 1.11 --- AbstractASTManager.java 16 May 2006 12:34:57 -0000 1.12 *************** *** 663,666 **** --- 663,667 ---- /** * Checks if some module can be resolved and returns the module it is resolved to (and to which token). + * */ protected Tuple<IModule, String> findOnImportedMods(IToken importedModule, String tok, IPythonNature nature, *************** *** 793,798 **** * that path until it finds the module or the path is empty. * - * @param rep * @param currentModuleName this is the module name (used to check validity for relative imports) -- not used if dontSearchInit is false * @return tuple with found module and the String removed from the path in * order to find the module. --- 794,802 ---- * that path until it finds the module or the path is empty. * * @param currentModuleName this is the module name (used to check validity for relative imports) -- not used if dontSearchInit is false + * if this parameter is not null, it means we're looking for a relative import. When checking for relative imports, + * we should only check the modules that are directly under this project (so, we should not check the whole pythonpath for + * it, just direct modules) + * * @return tuple with found module and the String removed from the path in * order to find the module. |