[Pydev-cvs] org.python.pydev.debug/pysrc pydevd_vars.py,1.8,1.9

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.debug/pysrc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22855/pysrc

Modified Files:
	pydevd_vars.py 
Log Message:


Index: pydevd_vars.py
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/pysrc/pydevd_vars.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pydevd_vars.py	6 May 2005 16:57:57 -0000	1.8
--- pydevd_vars.py	16 May 2005 11:16:46 -0000	1.9
***************
*** 8,11 ****
--- 8,14 ----
  import inspect
  
+ #types does not include a MethodWrapperType
+ MethodWrapperType = type([].__str__)
+ 
  class VariableError(Exception):
      def __init__(self, message):
***************
*** 39,43 ****
                  
                  if filterFunction:
!                     if inspect.ismethod(attr) or inspect.isfunction(attr):
                          continue
                  
--- 42,46 ----
                  
                  if filterFunction:
!                     if inspect.isroutine(attr) or isinstance(attr, MethodWrapperType):
                          continue
                  
***************
*** 85,89 ****
  
  def getType(o):
-     global typeMap
      """ returns a triple (typeObject, typeString, resolver
          resolver != None means that variable is a container, 
--- 88,91 ----
***************
*** 93,100 ****
          All container objects should have a resolver.
      """
!     if type(o) in typeMap:
!         return typeMap[type(o)]
!     else:
!         return (type(o), type(o).__name__, defaultResolver)
  
  def varToXML(v, name):
--- 95,104 ----
          All container objects should have a resolver.
      """
!     for t in typeMap:
!         if isinstance(o, t):
!             return typeMap[t]
!         
!     #no match return default        
!     return (type(o), type(o).__name__, defaultResolver)
  
  def varToXML(v, name):