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

[Guido van Rossum]

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

Modified Files:
	descrobject.c 
Log Message:
Rename 'getset' to 'property'.


Index: descrobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/descrobject.c,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -d -r2.10 -r2.11
*** descrobject.c	2001/08/30 03:10:36	2.10
--- descrobject.c	2001/09/06 21:55:04	2.11
***************
*** 841,848 ****
  
  
! /* A built-in 'getset' type */
  
  /*
!     class getset(object):
  
  	def __init__(self, get=None, set=None):
--- 841,848 ----
  
  
! /* A built-in 'property' type */
  
  /*
!     class property(object):
  
  	def __init__(self, get=None, set=None):
***************
*** 868,877 ****
  	PyObject *set;
  	PyObject *del;
! } getsetobject;
  
  static void
! getset_dealloc(PyObject *self)
  {
! 	getsetobject *gs = (getsetobject *)self;
  
  	Py_XDECREF(gs->get);
--- 868,877 ----
  	PyObject *set;
  	PyObject *del;
! } propertyobject;
  
  static void
! property_dealloc(PyObject *self)
  {
! 	propertyobject *gs = (propertyobject *)self;
  
  	Py_XDECREF(gs->get);
***************
*** 882,888 ****
  
  static PyObject *
! getset_descr_get(PyObject *self, PyObject *obj, PyObject *type)
  {
! 	getsetobject *gs = (getsetobject *)self;
  
  	if (gs->get == NULL) {
--- 882,888 ----
  
  static PyObject *
! property_descr_get(PyObject *self, PyObject *obj, PyObject *type)
  {
! 	propertyobject *gs = (propertyobject *)self;
  
  	if (gs->get == NULL) {
***************
*** 898,904 ****
  
  static int
! getset_descr_set(PyObject *self, PyObject *obj, PyObject *value)
  {
! 	getsetobject *gs = (getsetobject *)self;
  	PyObject *func, *res;
  
--- 898,904 ----
  
  static int
! property_descr_set(PyObject *self, PyObject *obj, PyObject *value)
  {
! 	propertyobject *gs = (propertyobject *)self;
  	PyObject *func, *res;
  
***************
*** 925,934 ****
  
  static int
! getset_init(PyObject *self, PyObject *args, PyObject *kwds)
  {
  	PyObject *get = NULL, *set = NULL, *del = NULL;
! 	getsetobject *gs = (getsetobject *)self;
  
! 	if (!PyArg_ParseTuple(args, "|OOO:getset", &get, &set, &del))
  		return -1;
  	if (get == Py_None)
--- 925,934 ----
  
  static int
! property_init(PyObject *self, PyObject *args, PyObject *kwds)
  {
  	PyObject *get = NULL, *set = NULL, *del = NULL;
! 	propertyobject *gs = (propertyobject *)self;
  
! 	if (!PyArg_ParseTuple(args, "|OOO:property", &get, &set, &del))
  		return -1;
  	if (get == Py_None)
***************
*** 945,950 ****
  }
  
! static char getset_doc[] =
! "getset([getfunc[, setfunc[, delfunc]]]) -> getset attribute\n"
  "Typical use to define a managed attribute x of C instances:\n"
  "class C(object):\n"
--- 945,950 ----
  }
  
! static char property_doc[] =
! "property([getfunc[, setfunc[, delfunc]]]) -> property attribute\n"
  "Typical use to define a managed attribute x of C instances:\n"
  "class C(object):\n"
***************
*** 952,965 ****
  "    def setx(self, value): self.__x = value\n"
  "    def delx(self): del self.__x\n"
! "    x = getset(getx, setx, delx)";
  
! PyTypeObject PyGetSet_Type = {
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,					/* ob_size */
! 	"getset",				/* tp_name */
! 	sizeof(getsetobject),			/* tp_basicsize */
  	0,					/* tp_itemsize */
  	/* methods */
! 	getset_dealloc,		 		/* tp_dealloc */
  	0,					/* tp_print */
  	0,					/* tp_getattr */
--- 952,965 ----
  "    def setx(self, value): self.__x = value\n"
  "    def delx(self): del self.__x\n"
! "    x = property(getx, setx, delx)";
  
! PyTypeObject PyProperty_Type = {
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,					/* ob_size */
! 	"property",				/* tp_name */
! 	sizeof(propertyobject),			/* tp_basicsize */
  	0,					/* tp_itemsize */
  	/* methods */
! 	property_dealloc,	 		/* tp_dealloc */
  	0,					/* tp_print */
  	0,					/* tp_getattr */
***************
*** 977,981 ****
  	0,					/* tp_as_buffer */
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
!  	getset_doc,				/* tp_doc */
   	0,					/* tp_traverse */
   	0,					/* tp_clear */
--- 977,981 ----
  	0,					/* tp_as_buffer */
  	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
!  	property_doc,				/* tp_doc */
   	0,					/* tp_traverse */
   	0,					/* tp_clear */
***************
*** 989,996 ****
  	0,					/* tp_base */
  	0,					/* tp_dict */
! 	getset_descr_get,			/* tp_descr_get */
! 	getset_descr_set,			/* tp_descr_set */
  	0,					/* tp_dictoffset */
! 	getset_init,				/* tp_init */
  	PyType_GenericAlloc,			/* tp_alloc */
  	PyType_GenericNew,			/* tp_new */
--- 989,996 ----
  	0,					/* tp_base */
  	0,					/* tp_dict */
! 	property_descr_get,			/* tp_descr_get */
! 	property_descr_set,			/* tp_descr_set */
  	0,					/* tp_dictoffset */
! 	property_init,				/* tp_init */
  	PyType_GenericAlloc,			/* tp_alloc */
  	PyType_GenericNew,			/* tp_new */