Add 'mutable' option to STRUCT_DICT macro

If the struct members are immutable then it doesn't need a __setitem__
function.

Author: jim-easterbrook

CHANGELOG.txt

@@ -20,6 +20,7 @@ Changes in v0.18.0:
   1/ Removed features deprecated in v0.13.0:
      Value (and derived types) copy constructors
      Single value (such as DateValue) index methods
+  2/ Added binary wheels for Linux on arm64.
 
 Changes in v0.17.3:
   1/ Binary wheels incorporate libexiv2 v0.28.5.

src/interface/datasets.i

@@ -1,6 +1,6 @@
 // python-exiv2 - Python interface to libexiv2
 // http://github.com/jim-easterbrook/python-exiv2
-// Copyright (C) 2021-24  Jim Easterbrook  [email protected]
+// Copyright (C) 2021-25  Jim Easterbrook  [email protected]
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ EXTEND_KEY(Exiv2::IptcKey);
 LIST_POINTER(const Exiv2::DataSet*, Exiv2::DataSet, number_ != 0xffff)
 
 // Give Exiv2::DataSet dict-like behaviour
-STRUCT_DICT(Exiv2::DataSet)
+STRUCT_DICT(Exiv2::DataSet, false)
 
 // Structs are all static data
 %ignore Exiv2::IptcDataSets::IptcDataSets;

src/interface/preview.i

@@ -1,6 +1,6 @@
 // python-exiv2 - Python interface to libexiv2
 // http://github.com/jim-easterbrook/python-exiv2
-// Copyright (C) 2021-24  Jim Easterbrook  [email protected]
+// Copyright (C) 2021-25  Jim Easterbrook  [email protected]
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -93,7 +93,7 @@ RETURN_VIEW(Exiv2::byte* pData, arg1->size(), PyBUF_READ,
             Exiv2::PreviewImage::pData)
 
 // Give Exiv2::PreviewProperties dict-like behaviour
-STRUCT_DICT(Exiv2::PreviewProperties)
+STRUCT_DICT(Exiv2::PreviewProperties, false)
 
 %immutable Exiv2::PreviewProperties::mimeType_;
 %immutable Exiv2::PreviewProperties::extension_;

src/interface/properties.i

@@ -1,6 +1,6 @@
 // python-exiv2 - Python interface to libexiv2
 // http://github.com/jim-easterbrook/python-exiv2
-// Copyright (C) 2021-24  Jim Easterbrook  [email protected]
+// Copyright (C) 2021-25  Jim Easterbrook  [email protected]
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -83,10 +83,10 @@ LIST_POINTER(const Exiv2::XmpPropertyInfo* xmpPropertyInfo_,
              Exiv2::XmpPropertyInfo, name_)
 
 // Give Exiv2::XmpPropertyInfo dict-like behaviour
-STRUCT_DICT(Exiv2::XmpPropertyInfo)
+STRUCT_DICT(Exiv2::XmpPropertyInfo, false)
 
 // Give Exiv2::XmpNsInfo dict-like behaviour
-STRUCT_DICT(Exiv2::XmpNsInfo)
+STRUCT_DICT(Exiv2::XmpNsInfo, false)
 
 // Structs are all static data
 %ignore Exiv2::XmpPropertyInfo::XmpPropertyInfo;

src/interface/shared/struct_dict.i

@@ -69,14 +69,12 @@ static PyObject* getset_to_value(PyObject* obj, PyGetSetDef* getset) {
 }
 
 // Macro definition
-%define STRUCT_DICT(struct_type)
+%define STRUCT_DICT(struct_type, mutable)
 // Type slots
 %feature("python:slot", "tp_iter", functype="getiterfunc")
     struct_type::__iter__;
 %feature("python:slot", "mp_subscript", functype="binaryfunc")
     struct_type::__getitem__;
-%feature("python:slot", "mp_ass_subscript", functype="objobjargproc")
-    struct_type::__setitem__;
 // Typemaps for slot functions
 %typemap(in, numinputs=0) PyObject* py_self {$1 = self;}
 %typemap(default) PyObject* value {$1 = NULL;}
@@ -117,6 +115,11 @@ static PyObject* getset_to_value(PyObject* obj, PyGetSetDef* getset) {
             return NULL;
         return getset->get(py_self, getset->closure);
     }
+}
+#if #mutable == "true"
+%feature("python:slot", "mp_ass_subscript", functype="objobjargproc")
+    struct_type::__setitem__;
+%extend struct_type {
     PyObject* __setitem__(PyObject* py_self, const std::string& key,
                           PyObject* value) {
         PyGetSetDef* getset = find_getset(py_self, key.c_str());
@@ -134,4 +137,5 @@ static PyObject* getset_to_value(PyObject* obj, PyGetSetDef* getset) {
         return SWIG_Py_Void();
     }
 }
+#endif // mutable
 %enddef // STRUCT_DICT

src/interface/tags.i

@@ -1,6 +1,6 @@
 // python-exiv2 - Python interface to libexiv2
 // http://github.com/jim-easterbrook/python-exiv2
-// Copyright (C) 2021-24  Jim Easterbrook  [email protected]
+// Copyright (C) 2021-25  Jim Easterbrook  [email protected]
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -98,10 +98,10 @@ LIST_POINTER(const Exiv2::GroupInfo*, Exiv2::GroupInfo, tagList_)
 LIST_POINTER(const Exiv2::TagInfo*, Exiv2::TagInfo, tag_ != 0xFFFF)
 
 // Give Exiv2::GroupInfo dict-like behaviour
-STRUCT_DICT(Exiv2::GroupInfo)
+STRUCT_DICT(Exiv2::GroupInfo, false)
 
 // Give Exiv2::TagInfo dict-like behaviour
-STRUCT_DICT(Exiv2::TagInfo)
+STRUCT_DICT(Exiv2::TagInfo, false)
 
 // Wrapper class for TagListFct function pointer
 #ifndef SWIGIMPORTED

src/interface/value.i

@@ -334,8 +334,8 @@ VALUE_SUBCLASS(Exiv2::ValueType<item_type>, type_name)
 %enddef // VALUETYPE
 
 // Give Date and Time structs some dict-like behaviour
-STRUCT_DICT(Exiv2::DateValue::Date)
-STRUCT_DICT(Exiv2::TimeValue::Time)
+STRUCT_DICT(Exiv2::DateValue::Date, true)
+STRUCT_DICT(Exiv2::TimeValue::Time, true)
 
 %extend Exiv2::DateValue {
     // Allow DateValue to be constructed from a Date

src/swig-0_27_7/datasets_wrap.cxx

@@ -4604,21 +4604,6 @@ SWIGINTERN PyObject *Exiv2_DataSet___getitem__(Exiv2::DataSet *self,PyObject *py
             return NULL;
         return getset->get(py_self, getset->closure);
     }
-SWIGINTERN PyObject *Exiv2_DataSet___setitem__(Exiv2::DataSet *self,PyObject *py_self,std::string const &key,PyObject *value){
-        PyGetSetDef* getset = find_getset(py_self, key.c_str());
-        if (!getset)
-            return NULL;
-        if (!value)
-            return PyErr_Format(PyExc_TypeError,
-                "%s['%s'] can not be deleted", py_self->ob_type->tp_name,
-                key.c_str());
-        if (!getset->set)
-            return PyErr_Format(PyExc_TypeError, "%s['%s'] is read-only",
-                                py_self->ob_type->tp_name, key.c_str());
-        if (getset->set(py_self, value, getset->closure) != 0)
-            return NULL;
-        return SWIG_Py_Void();
-    }
 
 #include <limits.h>
 #if !defined(SWIG_NO_LLONG_MAX)
@@ -5184,58 +5169,8 @@ SWIGINTERN PyObject *_wrap_DataSet___getitem__(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_DataSet___setitem__(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  Exiv2::DataSet *arg1 = (Exiv2::DataSet *) 0 ;
-  PyObject *arg2 = (PyObject *) 0 ;
-  std::string *arg3 = 0 ;
-  PyObject *arg4 = (PyObject *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res3 = SWIG_OLDOBJ ;
-  PyObject *swig_obj[3] ;
-  PyObject *result = 0 ;
-  
-  {
-    arg4 = NULL;
-  }
-  {
-    arg2 = self;
-  }
-  if (!SWIG_Python_UnpackTuple(args, "DataSet___setitem__", 1, 2, swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__DataSet, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataSet___setitem__" "', argument " "1"" of type '" "Exiv2::DataSet *""'"); 
-  }
-  arg1 = reinterpret_cast< Exiv2::DataSet * >(argp1);
-  {
-    std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "DataSet___setitem__" "', argument " "3"" of type '" "std::string const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "DataSet___setitem__" "', argument " "3"" of type '" "std::string const &""'"); 
-    }
-    arg3 = ptr;
-  }
-  if (swig_obj[1]) {
-    arg4 = swig_obj[1];
-  }
-  result = (PyObject *)Exiv2_DataSet___setitem__(arg1,arg2,(std::string const &)*arg3,arg4);
-  resultobj = result;
-  if (SWIG_IsNewObj(res3)) delete arg3;
-  return resultobj;
-fail:
-  if (SWIG_IsNewObj(res3)) delete arg3;
-  return NULL;
-}
-
-
 SWIGPY_GETITERFUNC_CLOSURE(_wrap_DataSet___iter__) /* defines _wrap_DataSet___iter___getiterfunc_closure */
 
-SWIGPY_OBJOBJARGPROC_CLOSURE(_wrap_DataSet___setitem__) /* defines _wrap_DataSet___setitem___objobjargproc_closure */
-
 SWIGINTERN PyObject *_wrap_IptcDataSets_dataSetName(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   uint16_t arg1 ;
@@ -5997,7 +5932,6 @@ SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__DataSet_methods[] = {
 		"" },
   { "__iter__", _wrap_DataSet___iter__, METH_NOARGS, "" },
   { "__getitem__", _wrap_DataSet___getitem__, METH_O, "" },
-  { "__setitem__", _wrap_DataSet___setitem__, METH_VARARGS, "" },
   { NULL, NULL, 0, NULL } /* Sentinel */
 };
 
@@ -6161,7 +6095,7 @@ static PyHeapTypeObject SwigPyBuiltin__Exiv2__DataSet_type = {
   {
     (lenfunc) 0,                            /* mp_length */
     _wrap_DataSet___getitem__,              /* mp_subscript */
-    _wrap_DataSet___setitem___objobjargproc_closure, /* mp_ass_subscript */
+    (objobjargproc) 0,                      /* mp_ass_subscript */
   },
   {
     (lenfunc) 0,                            /* sq_length */
@@ -6262,7 +6196,7 @@ static PyTypeObject *SwigPyBuiltin__Exiv2__DataSet_type_create(PyTypeObject *typ
     { Py_tp_descr_set,                  (void *)(descrsetfunc) 0 },
     { Py_mp_length,                     (void *)(lenfunc) 0 },
     { Py_mp_subscript,                  (void *)_wrap_DataSet___getitem__ },
-    { Py_mp_ass_subscript,              (void *)_wrap_DataSet___setitem___objobjargproc_closure },
+    { Py_mp_ass_subscript,              (void *)(objobjargproc) 0 },
     { Py_tp_iter,                       (void *)_wrap_DataSet___iter___getiterfunc_closure },
     { Py_tp_iternext,                   (void *)(iternextfunc) 0 },
     { Py_nb_add,                        (void *)(binaryfunc) 0 },

src/swig-0_27_7/preview_wrap.cxx

@@ -5661,21 +5661,6 @@ SWIGINTERN PyObject *Exiv2_PreviewProperties___getitem__(Exiv2::PreviewPropertie
             return NULL;
         return getset->get(py_self, getset->closure);
     }
-SWIGINTERN PyObject *Exiv2_PreviewProperties___setitem__(Exiv2::PreviewProperties *self,PyObject *py_self,std::string const &key,PyObject *value){
-        PyGetSetDef* getset = find_getset(py_self, key.c_str());
-        if (!getset)
-            return NULL;
-        if (!value)
-            return PyErr_Format(PyExc_TypeError,
-                "%s['%s'] can not be deleted", py_self->ob_type->tp_name,
-                key.c_str());
-        if (!getset->set)
-            return PyErr_Format(PyExc_TypeError, "%s['%s'] is read-only",
-                                py_self->ob_type->tp_name, key.c_str());
-        if (getset->set(py_self, value, getset->closure) != 0)
-            return NULL;
-        return SWIG_Py_Void();
-    }
 
   #define SWIG_From_long   PyInt_FromLong 
 
@@ -6186,62 +6171,6 @@ SWIGINTERN PyObject *_wrap_PreviewProperties___getitem__(PyObject *self, PyObjec
 }
 
 
-SWIGINTERN PyObject *_wrap_PreviewProperties___setitem__(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  Exiv2::PreviewProperties *arg1 = (Exiv2::PreviewProperties *) 0 ;
-  PyObject *arg2 = (PyObject *) 0 ;
-  std::string *arg3 = 0 ;
-  PyObject *arg4 = (PyObject *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int res3 = SWIG_OLDOBJ ;
-  PyObject *swig_obj[3] ;
-  PyObject *result = 0 ;
-  
-  {
-    arg4 = NULL;
-  }
-  {
-    arg2 = self;
-  }
-  if (!SWIG_Python_UnpackTuple(args, "PreviewProperties___setitem__", 1, 2, swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Exiv2__PreviewProperties, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PreviewProperties___setitem__" "', argument " "1"" of type '" "Exiv2::PreviewProperties *""'"); 
-  }
-  arg1 = reinterpret_cast< Exiv2::PreviewProperties * >(argp1);
-  {
-    std::string *ptr = (std::string *)0;
-    res3 = SWIG_AsPtr_std_string(swig_obj[0], &ptr);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PreviewProperties___setitem__" "', argument " "3"" of type '" "std::string const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PreviewProperties___setitem__" "', argument " "3"" of type '" "std::string const &""'"); 
-    }
-    arg3 = ptr;
-  }
-  if (swig_obj[1]) {
-    arg4 = swig_obj[1];
-  }
-  {
-    try {
-      result = (PyObject *)Exiv2_PreviewProperties___setitem__(arg1,arg2,(std::string const &)*arg3,arg4);
-    }
-    catch(std::exception const& e) {
-      _set_python_exception();
-      SWIG_fail;
-    }
-  }
-  resultobj = result;
-  if (SWIG_IsNewObj(res3)) delete arg3;
-  return resultobj;
-fail:
-  if (SWIG_IsNewObj(res3)) delete arg3;
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_delete_PreviewProperties(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   Exiv2::PreviewProperties *arg1 = (Exiv2::PreviewProperties *) 0 ;
@@ -6272,8 +6201,6 @@ SWIGINTERN PyObject *_wrap_delete_PreviewProperties(PyObject *self, PyObject *ar
 
 SWIGPY_GETITERFUNC_CLOSURE(_wrap_PreviewProperties___iter__) /* defines _wrap_PreviewProperties___iter___getiterfunc_closure */
 
-SWIGPY_OBJOBJARGPROC_CLOSURE(_wrap_PreviewProperties___setitem__) /* defines _wrap_PreviewProperties___setitem___objobjargproc_closure */
-
 SWIGPY_DESTRUCTOR_CLOSURE(_wrap_delete_PreviewProperties) /* defines _wrap_delete_PreviewProperties_destructor_closure */
 
 SWIGINTERN int _wrap_new_PreviewImage(PyObject *self, PyObject *args, PyObject *kwargs) {
@@ -6809,7 +6736,6 @@ SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__PreviewProperties_methods[] = {
 		"" },
   { "__iter__", _wrap_PreviewProperties___iter__, METH_NOARGS, "" },
   { "__getitem__", _wrap_PreviewProperties___getitem__, METH_O, "" },
-  { "__setitem__", _wrap_PreviewProperties___setitem__, METH_VARARGS, "" },
   { NULL, NULL, 0, NULL } /* Sentinel */
 };
 
@@ -6973,7 +6899,7 @@ static PyHeapTypeObject SwigPyBuiltin__Exiv2__PreviewProperties_type = {
   {
     (lenfunc) 0,                            /* mp_length */
     _wrap_PreviewProperties___getitem__,    /* mp_subscript */
-    _wrap_PreviewProperties___setitem___objobjargproc_closure, /* mp_ass_subscript */
+    (objobjargproc) 0,                      /* mp_ass_subscript */
   },
   {
     (lenfunc) 0,                            /* sq_length */
@@ -7074,7 +7000,7 @@ static PyTypeObject *SwigPyBuiltin__Exiv2__PreviewProperties_type_create(PyTypeO
     { Py_tp_descr_set,                  (void *)(descrsetfunc) 0 },
     { Py_mp_length,                     (void *)(lenfunc) 0 },
     { Py_mp_subscript,                  (void *)_wrap_PreviewProperties___getitem__ },
-    { Py_mp_ass_subscript,              (void *)_wrap_PreviewProperties___setitem___objobjargproc_closure },
+    { Py_mp_ass_subscript,              (void *)(objobjargproc) 0 },
     { Py_tp_iter,                       (void *)_wrap_PreviewProperties___iter___getiterfunc_closure },
     { Py_tp_iternext,                   (void *)(iternextfunc) 0 },
     { Py_nb_add,                        (void *)(binaryfunc) 0 },