Skip to content

Commit f0e4c8b

Browse files
jim-easterbrookjim-easterbrook
committed
Use Py_TYPE macro
1 parent 0056320 commit f0e4c8b

11 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎src/interface/shared/struct_dict.i‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
%fragment("getset_functions", "header") {
2323
static PyObject* list_getset(
2424
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
25-
PyGetSetDef* getset = obj->ob_type->tp_getset;
25+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
2626
PyObject* result = PyList_New(0);
2727
PyObject* item = NULL;
2828
while (getset->name) {
@@ -64,12 +64,12 @@ static int set_attr_no_delete(
6464
PyObject* obj, PyObject* name, PyObject* value) {
6565
if ((!value) && PyUnicode_Check(name)) {
6666
const char* c_name = PyUnicode_AsUTF8(name);
67-
PyGetSetDef* getset = obj->ob_type->tp_getset;
67+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
6868
while (getset->name) {
6969
if (strcmp(getset->name, c_name) == 0) {
7070
PyErr_Format(PyExc_TypeError,
7171
"%s.%s can not be deleted",
72-
obj->ob_type->tp_name, c_name);
72+
Py_TYPE(obj)->tp_name, c_name);
7373
return -1;
7474
}
7575
getset++;
@@ -148,7 +148,7 @@ static int set_attr_no_delete(
148148
PyObject* value) {
149149
if (!value)
150150
return PyErr_Format(PyExc_TypeError,
151-
"%s['%s'] can not be deleted", py_self->ob_type->tp_name,
151+
"%s['%s'] can not be deleted", Py_TYPE(py_self)->tp_name,
152152
key.c_str());
153153
#if #strip_underscore == "true"
154154
int error = PyObject_SetAttrString(

‎src/swig-0_27_7/datasets_wrap.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4364,7 +4364,7 @@ static void _set_python_exception() {
43644364

43654365
static PyObject* list_getset(
43664366
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
4367-
PyGetSetDef* getset = obj->ob_type->tp_getset;
4367+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
43684368
PyObject* result = PyList_New(0);
43694369
PyObject* item = NULL;
43704370
while (getset->name) {

‎src/swig-0_27_7/preview_wrap.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5459,7 +5459,7 @@ static int getbuffer_Exiv2_PreviewImage(
54595459

54605460
static PyObject* list_getset(
54615461
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
5462-
PyGetSetDef* getset = obj->ob_type->tp_getset;
5462+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
54635463
PyObject* result = PyList_New(0);
54645464
PyObject* item = NULL;
54655465
while (getset->name) {

‎src/swig-0_27_7/properties_wrap.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4413,7 +4413,7 @@ static PyObject* _get_enum_list(int dummy, ...) {
44134413

44144414
static PyObject* list_getset(
44154415
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
4416-
PyGetSetDef* getset = obj->ob_type->tp_getset;
4416+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
44174417
PyObject* result = PyList_New(0);
44184418
PyObject* item = NULL;
44194419
while (getset->name) {

‎src/swig-0_27_7/tags_wrap.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4393,7 +4393,7 @@ static PyObject* pointer_to_list(Exiv2::TagInfo* ptr) {
43934393

43944394
static PyObject* list_getset(
43954395
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
4396-
PyGetSetDef* getset = obj->ob_type->tp_getset;
4396+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
43974397
PyObject* result = PyList_New(0);
43984398
PyObject* item = NULL;
43994399
while (getset->name) {

‎src/swig-0_27_7/value_wrap.cxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4567,12 +4567,12 @@ static int set_attr_no_delete(
45674567
PyObject* obj, PyObject* name, PyObject* value) {
45684568
if ((!value) && PyUnicode_Check(name)) {
45694569
const char* c_name = PyUnicode_AsUTF8(name);
4570-
PyGetSetDef* getset = obj->ob_type->tp_getset;
4570+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
45714571
while (getset->name) {
45724572
if (strcmp(getset->name, c_name) == 0) {
45734573
PyErr_Format(PyExc_TypeError,
45744574
"%s.%s can not be deleted",
4575-
obj->ob_type->tp_name, c_name);
4575+
Py_TYPE(obj)->tp_name, c_name);
45764576
return -1;
45774577
}
45784578
getset++;
@@ -6634,7 +6634,7 @@ SWIGINTERN void Exiv2_DateValue_setDate__SWIG_1(Exiv2::DateValue *self,int year,
66346634

66356635
static PyObject* list_getset(
66366636
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
6637-
PyGetSetDef* getset = obj->ob_type->tp_getset;
6637+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
66386638
PyObject* result = PyList_New(0);
66396639
PyObject* item = NULL;
66406640
while (getset->name) {
@@ -6686,7 +6686,7 @@ SWIGINTERN PyObject *Exiv2_DateValue_Date___getitem__(Exiv2::DateValue::Date *se
66866686
SWIGINTERN PyObject *Exiv2_DateValue_Date___setitem__(Exiv2::DateValue::Date *self,PyObject *py_self,std::string const &key,PyObject *value){
66876687
if (!value)
66886688
return PyErr_Format(PyExc_TypeError,
6689-
"%s['%s'] can not be deleted", py_self->ob_type->tp_name,
6689+
"%s['%s'] can not be deleted", Py_TYPE(py_self)->tp_name,
66906690
key.c_str());
66916691

66926692

@@ -6738,7 +6738,7 @@ SWIGINTERN PyObject *Exiv2_TimeValue_Time___getitem__(Exiv2::TimeValue::Time *se
67386738
SWIGINTERN PyObject *Exiv2_TimeValue_Time___setitem__(Exiv2::TimeValue::Time *self,PyObject *py_self,std::string const &key,PyObject *value){
67396739
if (!value)
67406740
return PyErr_Format(PyExc_TypeError,
6741-
"%s['%s'] can not be deleted", py_self->ob_type->tp_name,
6741+
"%s['%s'] can not be deleted", Py_TYPE(py_self)->tp_name,
67426742
key.c_str());
67436743

67446744

‎src/swig-0_28_5/datasets_wrap.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4364,7 +4364,7 @@ static void _set_python_exception() {
43644364

43654365
static PyObject* list_getset(
43664366
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
4367-
PyGetSetDef* getset = obj->ob_type->tp_getset;
4367+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
43684368
PyObject* result = PyList_New(0);
43694369
PyObject* item = NULL;
43704370
while (getset->name) {

‎src/swig-0_28_5/preview_wrap.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5459,7 +5459,7 @@ static int getbuffer_Exiv2_PreviewImage(
54595459

54605460
static PyObject* list_getset(
54615461
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
5462-
PyGetSetDef* getset = obj->ob_type->tp_getset;
5462+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
54635463
PyObject* result = PyList_New(0);
54645464
PyObject* item = NULL;
54655465
while (getset->name) {

‎src/swig-0_28_5/properties_wrap.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4413,7 +4413,7 @@ static PyObject* _get_enum_list(int dummy, ...) {
44134413

44144414
static PyObject* list_getset(
44154415
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
4416-
PyGetSetDef* getset = obj->ob_type->tp_getset;
4416+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
44174417
PyObject* result = PyList_New(0);
44184418
PyObject* item = NULL;
44194419
while (getset->name) {

‎src/swig-0_28_5/tags_wrap.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4465,7 +4465,7 @@ static PyObject* pointer_to_list(Exiv2::TagInfo* ptr) {
44654465

44664466
static PyObject* list_getset(
44674467
PyObject* obj, PyObject* (*conv)(PyObject*, PyGetSetDef*)) {
4468-
PyGetSetDef* getset = obj->ob_type->tp_getset;
4468+
PyGetSetDef* getset = Py_TYPE(obj)->tp_getset;
44694469
PyObject* result = PyList_New(0);
44704470
PyObject* item = NULL;
44714471
while (getset->name) {

0 commit comments

Comments
 (0)