[Pydev-cvs] org.python.pydev/PySrc importsTipper.py,1.19,1.20
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2006-09-24 23:15:16
|
Update of /cvsroot/pydev/org.python.pydev/PySrc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26806/PySrc Modified Files: importsTipper.py Log Message: Index: importsTipper.py =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/PySrc/importsTipper.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** importsTipper.py 13 Jul 2006 23:46:03 -0000 1.19 --- importsTipper.py 24 Sep 2006 23:15:14 -0000 1.20 *************** *** 237,241 **** retType = TYPE_FUNCTION ! --- 237,249 ---- retType = TYPE_FUNCTION ! ! elif inspect.isclass(obj): ! retType = TYPE_CLASS ! ! elif inspect.ismodule(obj): ! retType = TYPE_IMPORT ! ! else: ! retType = TYPE_ATTR *************** *** 247,254 **** else: #getCompleteInfo == False ! ! #ok, no complete info, let's try to do this as fast and clean as possible ! #so, no docs for this kind of information, only the signatures ! ret.append( (d, '', args, TYPE_BUILTIN_AS_STR) ) return ret --- 255,277 ---- else: #getCompleteInfo == False ! try: ! obj = getattr(mod, d) ! except: #just ignore and get it without aditional info ! ret.append( (d, '', args, TYPE_BUILTIN_AS_STR) ) ! else: ! if inspect.ismethod(obj) or inspect.isbuiltin(obj) or inspect.isfunction(obj) or inspect.isroutine(obj): ! retType = TYPE_FUNCTION ! ! elif inspect.isclass(obj): ! retType = TYPE_CLASS ! ! elif inspect.ismodule(obj): ! retType = TYPE_IMPORT ! ! else: ! retType = TYPE_ATTR ! #ok, no complete info, let's try to do this as fast and clean as possible ! #so, no docs for this kind of information, only the signatures ! ret.append( (d, '', args, retType) ) return ret |