@@ -1508,6 +1508,8 @@ PyWrapper_New(PyObject *d, PyObject *self)
1508
1508
1509
1509
/* A built-in 'property' type */
1510
1510
1511
+ #define _propertyobject_CAST (op ) ((propertyobject *)(op))
1512
+
1511
1513
/*
1512
1514
class property(object):
1513
1515
@@ -1911,8 +1913,9 @@ property_init_impl(propertyobject *self, PyObject *fget, PyObject *fset,
1911
1913
}
1912
1914
1913
1915
static PyObject *
1914
- property_get__name__ (propertyobject * prop , void * Py_UNUSED (ignored ))
1916
+ property_get__name__ (PyObject * op , void * Py_UNUSED (ignored ))
1915
1917
{
1918
+ propertyobject * prop = _propertyobject_CAST (op );
1916
1919
PyObject * name ;
1917
1920
if (property_name (prop , & name ) < 0 ) {
1918
1921
return NULL ;
@@ -1925,16 +1928,17 @@ property_get__name__(propertyobject *prop, void *Py_UNUSED(ignored))
1925
1928
}
1926
1929
1927
1930
static int
1928
- property_set__name__ (propertyobject * prop , PyObject * value ,
1929
- void * Py_UNUSED (ignored ))
1931
+ property_set__name__ (PyObject * op , PyObject * value , void * Py_UNUSED (ignored ))
1930
1932
{
1933
+ propertyobject * prop = _propertyobject_CAST (op );
1931
1934
Py_XSETREF (prop -> prop_name , Py_XNewRef (value ));
1932
1935
return 0 ;
1933
1936
}
1934
1937
1935
1938
static PyObject *
1936
- property_get___isabstractmethod__ (propertyobject * prop , void * closure )
1939
+ property_get___isabstractmethod__ (PyObject * op , void * closure )
1937
1940
{
1941
+ propertyobject * prop = _propertyobject_CAST (op );
1938
1942
int res = _PyObject_IsAbstract (prop -> prop_get );
1939
1943
if (res == -1 ) {
1940
1944
return NULL ;
@@ -1962,9 +1966,8 @@ property_get___isabstractmethod__(propertyobject *prop, void *closure)
1962
1966
}
1963
1967
1964
1968
static PyGetSetDef property_getsetlist [] = {
1965
- {"__name__" , (getter )property_get__name__ , (setter )property_set__name__ },
1966
- {"__isabstractmethod__" ,
1967
- (getter )property_get___isabstractmethod__ , NULL ,
1969
+ {"__name__" , property_get__name__ , property_set__name__ , NULL , NULL },
1970
+ {"__isabstractmethod__" , property_get___isabstractmethod__ , NULL ,
1968
1971
NULL ,
1969
1972
NULL },
1970
1973
{NULL } /* Sentinel */
0 commit comments