[Pydev-cvs] org.python.pydev/PySrc jyimportsTipper.py, 1.11, 1.11.2.1 interpreterInfo.py, 1.11.2.1, 1.11.2.2

[Sean H. <se...@us...>]

Update of /cvsroot/pydev/org.python.pydev/PySrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11524/PySrc

Modified Files:
      Tag: SoC_2006
	jyimportsTipper.py interpreterInfo.py 
Log Message:


Index: interpreterInfo.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/PySrc/interpreterInfo.py,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -d -r1.11.2.1 -r1.11.2.2
*** interpreterInfo.py	22 Jun 2006 09:29:18 -0000	1.11.2.1
--- interpreterInfo.py	24 Jun 2006 21:56:35 -0000	1.11.2.2
***************
*** 14,17 ****
--- 14,18 ----
  import sys
  import os
+ True, False = 1,0 
  
  if __name__ == '__main__':

Index: jyimportsTipper.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/PySrc/jyimportsTipper.py,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** jyimportsTipper.py	14 Jan 2006 00:15:34 -0000	1.11
--- jyimportsTipper.py	24 Jun 2006 21:56:35 -0000	1.11.2.1
***************
*** 256,260 ****
          classes = []
          classes.append(obj)
!         c = obj.getSuperclass()
          while c != None:
              classes.append(c)
--- 256,265 ----
          classes = []
          classes.append(obj)
!         try:
!             c = obj.getSuperclass()
!         except TypeError:
!             #may happen on jython when getting the java.lang.Class class
!             c = obj.getSuperclass(obj)
!             
          while c != None:
              classes.append(c)
***************
*** 264,274 ****
          interfs = []
          for obj in classes:
!             interfs.extend(obj.getInterfaces())
          classes.extend(interfs)
              
          #now is the time when we actually get info on the declared methods and fields
          for obj in classes:
!             declaredMethods = obj.getDeclaredMethods()
!             declaredFields = obj.getDeclaredFields()
              for i in range(len(declaredMethods)):
                  name = declaredMethods[i].getName()
--- 269,290 ----
          interfs = []
          for obj in classes:
!             try:
!                 interfs.extend(obj.getInterfaces())
!             except TypeError:
!                 interfs.extend(obj.getInterfaces(obj))
          classes.extend(interfs)
              
          #now is the time when we actually get info on the declared methods and fields
          for obj in classes:
!             try:
!                 declaredMethods = obj.getDeclaredMethods()
!             except TypeError:
!                 declaredMethods = obj.getDeclaredMethods(obj)
!                 
!             try:
!                 declaredFields = obj.getDeclaredFields()
!             except TypeError:
!                 declaredFields = obj.getDeclaredFields(obj)
!                 
              for i in range(len(declaredMethods)):
                  name = declaredMethods[i].getName()