[Python-checkins] CVS: python/dist/src/Objects descrobject.c,2.19,2.20

[Guido van Rossum]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv15762

Modified Files:
	descrobject.c 
Log Message:
Fix the Python property class in a comment right.


Index: descrobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/descrobject.c,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -d -r2.19 -r2.20
*** descrobject.c	2001/12/10 18:00:15	2.19
--- descrobject.c	2001/12/10 18:03:34	2.20
***************
*** 905,930 ****
      class property(object):
  
! 	def __init__(self, fget=None, fset=None, fdel=None, doc=None):
! 	    self.__get = fget
! 	    self.__set = fset
! 	    self.__del = fdel
! 	    self.__doc__ = doc
  
! 	def __get__(self, inst, type=None):
! 	    if self.__get is NULL:
! 		raise AttributeError, "unreadable attribute"
! 	    if inst is None:
! 	        return self
! 	    return self.__get(inst)
  
! 	def __set__(self, inst, value):
! 	    if value is None:
! 	    	if self.__del is None:
! 	    	    raise AttributeError, "can't delete attribute"
! 	    	return self.__del(inst)
! 	    else:
! 	        if self.__set is None:
! 	            raise AttributeError, "can't set attribute"
! 	        return self.__set(inst, value)
  */
  
--- 905,931 ----
      class property(object):
  
!         def __init__(self, fget=None, fset=None, fdel=None, doc=None):
!             self.__get = fget
!             self.__set = fset
!             self.__del = fdel
!             self.__doc__ = doc
  
!         def __get__(self, inst, type=None):
!             if self.__get is None:
!                 raise AttributeError, "unreadable attribute"
!             if inst is None:
!                 return self
!             return self.__get(inst)
  
!         def __set__(self, inst, value):
!             if self.__set is None:
!                 raise AttributeError, "can't set attribute"
!             return self.__set(inst, value)
! 
!         def __delete__(self, inst):
!             if self.__del is None:
!                 raise AttributeError, "can't delete attribute"
!             return self.__del(inst)
! 
  */