Undeprecate "struct_dict" functions

This mostly undoes 3b852be and c50b558. Iterating over the  struct
remains deprecated as it's the least intuitive struct-like behaviour.

Author: jim-easterbrook

CHANGELOG.txt

@@ -38,8 +38,7 @@ Changes in v0.18.0:
   9/ BasicIo.read (& readOrThrow) now extract count from the buffer size.
  10/ Invalidate data iterators if data is deleted. (Requires swig >= 4.4)
  11/ Add __members__ attribute to exiv2 "data" structure types.
- 12/ Deprecated keys(), values(), and items() methods and iterator of exiv2
-     "data" structure types.
+ 12/ Deprecated iteration of exiv2 "data" structure types.
  13/ API CHANGE: exiv2.LogMsg.pythonHandler is replaced by exiv2.pythonHandler
 
 Changes in v0.17.5:

src/interface/shared/struct_dict.i

@@ -121,7 +121,6 @@ static PyObject* items_struct(struct_info& info, PyObject* obj) {
 %feature("python:slot", "tp_iter", functype="getiterfunc")
     struct_type::__iter__;
 // These functions don't throw exceptions
-%noexception struct_type::__members__;
 %noexception struct_type::__iter__;
 %noexception struct_type::keys;
 %noexception struct_type::values;
@@ -131,70 +130,47 @@ static PyObject* items_struct(struct_info& info, PyObject* obj) {
 // Document functions
 %feature("docstring") struct_type::items "Get structure members.
 :rtype: tuple of (str, value) tuple
-:return: structure member (name, value) pairs (with any trailing
-    underscores removed from names)."
+:return: structure member (name, value) pairs."
 %feature("docstring") struct_type::keys "Get structure member names.
-:rtype: tuple of str
-:return: structure member names (with any trailing underscores
-    removed)."
-%feature("docstring") struct_type::values "Get structure member values.
-:rtype: tuple of value
-:return: structure member values."
-%feature("docstring") struct_type::__members__ "Structure member names.
-
-:type: tuple of str
 
-List of names used to access members as attributes (``object.name``) or
-with dict-like indexing (``object['name']``). Attribute access is
+Return the names used to access members as attributes (``object.name``)
+or with dict-like indexing (``object['name']``). Attribute access is
 preferred as it is more efficient."
 #if #strip_underscore == "true"
 "
 
-Although the actual structure member names end with underscores, the
-Python interface uses names without underscores, as listed in
-``__members__``."
+Although the exiv2 C++ structure member names end with underscores, the
+Python interface uses names without underscores."
 #endif
-// Getter function for __members__
-%fragment("members_get"{struct_type}, "header",
-          fragment="struct_info"{struct_type}, fragment="keys_struct") {
-static PyObject* %mangle(struct_type)___members___get(struct_type*) {
-    init_info_%mangle(struct_type)();
-    return keys_struct(info_%mangle(struct_type));
-};
-}
+"
+:rtype: tuple of str
+:return: structure member names.
+"
+%feature("docstring") struct_type::values "Get structure member values.
+:rtype: tuple of value
+:return: structure member values."
 // Add functions
 %extend struct_type {
     %fragment("struct_info"{struct_type});
-    %fragment("members_get"{struct_type});
+    %fragment("keys_struct");
     %fragment("values_struct");
     %fragment("items_struct");
-    PyObject* __members__ const;
     PyObject* keys() {
-        // Deprecated since 2025-09-11
-        PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please use __members__ to get the struct member names", 1);
-        return %mangle(struct_type)___members___get(self);
+        init_info_%mangle(struct_type)();
+        return keys_struct(info_%mangle(struct_type));
     }
     PyObject* values(PyObject* py_self) {
-        // Deprecated since 2025-09-11
-        PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please use __members__ to get the struct member names"
-             " and getattr to get values from names", 1);
         init_info_%mangle(struct_type)();
         return values_struct(info_%mangle(struct_type), py_self);
     }
     PyObject* items(PyObject* py_self) {
-        // Deprecated since 2025-09-11
-        PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please use __members__ to get the struct member names"
-             " and getattr to get values from names", 1);
         init_info_%mangle(struct_type)();
         return items_struct(info_%mangle(struct_type), py_self);
     }
     static PyObject* __iter__() {
         // Deprecated since 2025-09-11
         PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please iterate over the __members__ attribute", 1);
+             "Please iterate over keys() function output", 1);
         init_info_%mangle(struct_type)();
         PyObject* seq = keys_struct(info_%mangle(struct_type));
         PyObject* result = PySeqIter_New(seq);

src/swig-0_27_7/datasets_wrap.cxx

@@ -4424,12 +4424,6 @@ static PyObject* keys_struct(struct_info& info) {
 };
 
 
-static PyObject* Exiv2_DataSet___members___get(Exiv2::DataSet*) {
-    init_info_Exiv2_DataSet();
-    return keys_struct(info_Exiv2_DataSet);
-};
-
-
 static PyObject* values_struct(struct_info& info, PyObject* obj) {
     PyObject* result = PyTuple_New(info.members.size());
     for (size_t i = 0; i < info.members.size(); i++)
@@ -4481,31 +4475,21 @@ SWIGINTERNINLINE PyObject*
 }
 
 SWIGINTERN PyObject *Exiv2_DataSet_keys(Exiv2::DataSet *self){
-        // Deprecated since 2025-09-11
-        PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please use __members__ to get the struct member names", 1);
-        return Exiv2_DataSet___members___get(self);
+        init_info_Exiv2_DataSet();
+        return keys_struct(info_Exiv2_DataSet);
     }
 SWIGINTERN PyObject *Exiv2_DataSet_values(Exiv2::DataSet *self,PyObject *py_self){
-        // Deprecated since 2025-09-11
-        PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please use __members__ to get the struct member names"
-             " and getattr to get values from names", 1);
         init_info_Exiv2_DataSet();
         return values_struct(info_Exiv2_DataSet, py_self);
     }
 SWIGINTERN PyObject *Exiv2_DataSet_items(Exiv2::DataSet *self,PyObject *py_self){
-        // Deprecated since 2025-09-11
-        PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please use __members__ to get the struct member names"
-             " and getattr to get values from names", 1);
         init_info_Exiv2_DataSet();
         return items_struct(info_Exiv2_DataSet, py_self);
     }
 SWIGINTERN PyObject *Exiv2_DataSet___iter__(){
         // Deprecated since 2025-09-11
         PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please iterate over the __members__ attribute", 1);
+             "Please iterate over keys() function output", 1);
         init_info_Exiv2_DataSet();
         PyObject* seq = keys_struct(info_Exiv2_DataSet);
         PyObject* result = PySeqIter_New(seq);
@@ -5048,27 +5032,6 @@ SWIGINTERN PyObject *_wrap_DataSet_photoshop__get(PyObject *self, PyObject *args
 }
 
 
-SWIGINTERN PyObject *_wrap_DataSet___members___get(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  Exiv2::DataSet *arg1 = (Exiv2::DataSet *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args, "DataSet___members___get", 0, 0, 0)) 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___members___get" "', argument " "1"" of type '" "Exiv2::DataSet *""'"); 
-  }
-  arg1 = reinterpret_cast< Exiv2::DataSet * >(argp1);
-  result = (PyObject *)Exiv2_DataSet___members___get(arg1);
-  resultobj = result;
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_DataSet_keys(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   Exiv2::DataSet *arg1 = (Exiv2::DataSet *) 0 ;
@@ -5852,7 +5815,6 @@ static SwigPyGetSet DataSet_title__getset = { _wrap_DataSet_title__get, 0 };
 static SwigPyGetSet DataSet_photoshop__getset = { _wrap_DataSet_photoshop__get, 0 };
 static SwigPyGetSet DataSet_desc__getset = { _wrap_DataSet_desc__get, 0 };
 static SwigPyGetSet DataSet_repeatable__getset = { _wrap_DataSet_repeatable__get, 0 };
-static SwigPyGetSet DataSet___members___getset = { _wrap_DataSet___members___get, 0 };
 static SwigPyGetSet DataSet_number__getset = { _wrap_DataSet_number__get, 0 };
 static SwigPyGetSet DataSet_maxbytes__getset = { _wrap_DataSet_maxbytes__get, 0 };
 static SwigPyGetSet DataSet___dict___getset = { SwigPyObject_get___dict__, 0 };
@@ -5866,19 +5828,6 @@ SWIGINTERN PyGetSetDef SwigPyBuiltin__Exiv2__DataSet_getset[] = {
     { (char *)"photoshop_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Photoshop string", &DataSet_photoshop__getset },
     { (char *)"desc_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Dataset description", &DataSet_desc__getset },
     { (char *)"repeatable_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"True if dataset is repeatable", &DataSet_repeatable__getset },
-    { (char *)"__members__", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"\n"
-		"Structure member names.\n"
-		"\n"
-		":type: tuple of str\n"
-		"\n"
-		"List of names used to access members as attributes (``object.name``) or\n"
-		"with dict-like indexing (``object['name']``). Attribute access is\n"
-		"preferred as it is more efficient.\n"
-		"\n"
-		"Although the actual structure member names end with underscores, the\n"
-		"Python interface uses names without underscores, as listed in\n"
-		"``__members__``.\n"
-		"", &DataSet___members___getset },
     { (char *)"number_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Dataset number", &DataSet_number__getset },
     { (char *)"maxbytes_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Maximum number of bytes", &DataSet_maxbytes__getset },
     { (char *)"__dict__", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Dataset number", &DataSet___dict___getset },
@@ -5907,9 +5856,16 @@ SwigPyBuiltin__Exiv2__DataSet_richcompare(PyObject *self, PyObject *other, int o
 SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__DataSet_methods[] = {
   { "keys", _wrap_DataSet_keys, METH_NOARGS, "\n"
 		"Get structure member names.\n"
+		"\n"
+		"Return the names used to access members as attributes (``object.name``)\n"
+		"or with dict-like indexing (``object['name']``). Attribute access is\n"
+		"preferred as it is more efficient.\n"
+		"\n"
+		"Although the exiv2 C++ structure member names end with underscores, the\n"
+		"Python interface uses names without underscores.\n"
 		":rtype: tuple of str\n"
-		":return: structure member names (with any trailing underscores\n"
-		"    removed).\n"
+		":return: structure member names.\n"
+		"\n"
 		"" },
   { "values", _wrap_DataSet_values, METH_NOARGS, "\n"
 		"Get structure member values.\n"
@@ -5919,8 +5875,7 @@ SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__DataSet_methods[] = {
   { "items", _wrap_DataSet_items, METH_NOARGS, "\n"
 		"Get structure members.\n"
 		":rtype: tuple of (str, value) tuple\n"
-		":return: structure member (name, value) pairs (with any trailing\n"
-		"    underscores removed from names).\n"
+		":return: structure member (name, value) pairs.\n"
 		"" },
   { "__iter__", (PyCFunction)(void(*)(void))_wrap_DataSet___iter__, METH_STATIC|METH_NOARGS, "" },
   { NULL, NULL, 0, NULL } /* Sentinel */

src/swig-0_27_7/preview_wrap.cxx

@@ -5517,12 +5517,6 @@ static PyObject* keys_struct(struct_info& info) {
 };
 
 
-static PyObject* Exiv2_PreviewProperties___members___get(Exiv2::PreviewProperties*) {
-    init_info_Exiv2_PreviewProperties();
-    return keys_struct(info_Exiv2_PreviewProperties);
-};
-
-
 static PyObject* values_struct(struct_info& info, PyObject* obj) {
     PyObject* result = PyTuple_New(info.members.size());
     for (size_t i = 0; i < info.members.size(); i++)
@@ -5563,31 +5557,21 @@ SWIGINTERNINLINE PyObject*
 }
 
 SWIGINTERN PyObject *Exiv2_PreviewProperties_keys(Exiv2::PreviewProperties *self){
-        // Deprecated since 2025-09-11
-        PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please use __members__ to get the struct member names", 1);
-        return Exiv2_PreviewProperties___members___get(self);
+        init_info_Exiv2_PreviewProperties();
+        return keys_struct(info_Exiv2_PreviewProperties);
     }
 SWIGINTERN PyObject *Exiv2_PreviewProperties_values(Exiv2::PreviewProperties *self,PyObject *py_self){
-        // Deprecated since 2025-09-11
-        PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please use __members__ to get the struct member names"
-             " and getattr to get values from names", 1);
         init_info_Exiv2_PreviewProperties();
         return values_struct(info_Exiv2_PreviewProperties, py_self);
     }
 SWIGINTERN PyObject *Exiv2_PreviewProperties_items(Exiv2::PreviewProperties *self,PyObject *py_self){
-        // Deprecated since 2025-09-11
-        PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please use __members__ to get the struct member names"
-             " and getattr to get values from names", 1);
         init_info_Exiv2_PreviewProperties();
         return items_struct(info_Exiv2_PreviewProperties, py_self);
     }
 SWIGINTERN PyObject *Exiv2_PreviewProperties___iter__(){
         // Deprecated since 2025-09-11
         PyErr_WarnEx(PyExc_DeprecationWarning,
-             "Please iterate over the __members__ attribute", 1);
+             "Please iterate over keys() function output", 1);
         init_info_Exiv2_PreviewProperties();
         PyObject* seq = keys_struct(info_Exiv2_PreviewProperties);
         PyObject* result = PySeqIter_New(seq);
@@ -6075,27 +6059,6 @@ SWIGINTERN PyObject *_wrap_PreviewProperties_id__get(PyObject *self, PyObject *a
 }
 
 
-SWIGINTERN PyObject *_wrap_PreviewProperties___members___get(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  Exiv2::PreviewProperties *arg1 = (Exiv2::PreviewProperties *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *result = 0 ;
-  
-  if (!SWIG_Python_UnpackTuple(args, "PreviewProperties___members___get", 0, 0, 0)) 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___members___get" "', argument " "1"" of type '" "Exiv2::PreviewProperties *""'"); 
-  }
-  arg1 = reinterpret_cast< Exiv2::PreviewProperties * >(argp1);
-  result = (PyObject *)Exiv2_PreviewProperties___members___get(arg1);
-  resultobj = result;
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_PreviewProperties_keys(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   Exiv2::PreviewProperties *arg1 = (Exiv2::PreviewProperties *) 0 ;
@@ -6729,7 +6692,6 @@ static PyMethodDef SwigMethods[] = {
 
 static SwigPyGetSet PreviewProperties_height__getset = { _wrap_PreviewProperties_height__get, 0 };
 static SwigPyGetSet PreviewProperties_id__getset = { _wrap_PreviewProperties_id__get, 0 };
-static SwigPyGetSet PreviewProperties___members___getset = { _wrap_PreviewProperties___members___get, 0 };
 static SwigPyGetSet PreviewProperties_mimeType__getset = { _wrap_PreviewProperties_mimeType__get, 0 };
 static SwigPyGetSet PreviewProperties_size__getset = { _wrap_PreviewProperties_size__get, 0 };
 static SwigPyGetSet PreviewProperties_width__getset = { _wrap_PreviewProperties_width__get, 0 };
@@ -6738,19 +6700,6 @@ static SwigPyGetSet PreviewProperties_extension__getset = { _wrap_PreviewPropert
 SWIGINTERN PyGetSetDef SwigPyBuiltin__Exiv2__PreviewProperties_getset[] = {
     { (char *)"height_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Preview image height in pixels or 0 for unknown height.", &PreviewProperties_height__getset },
     { (char *)"id_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Identifies type of preview image.", &PreviewProperties_id__getset },
-    { (char *)"__members__", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"\n"
-		"Structure member names.\n"
-		"\n"
-		":type: tuple of str\n"
-		"\n"
-		"List of names used to access members as attributes (``object.name``) or\n"
-		"with dict-like indexing (``object['name']``). Attribute access is\n"
-		"preferred as it is more efficient.\n"
-		"\n"
-		"Although the actual structure member names end with underscores, the\n"
-		"Python interface uses names without underscores, as listed in\n"
-		"``__members__``.\n"
-		"", &PreviewProperties___members___getset },
     { (char *)"mimeType_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Preview image mime type.", &PreviewProperties_mimeType__getset },
     { (char *)"size_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Preview image size in bytes.", &PreviewProperties_size__getset },
     { (char *)"width_", SwigPyBuiltin_FunpackGetterClosure, 0, (char *)"Preview image width in pixels or 0 for unknown width.", &PreviewProperties_width__getset },
@@ -6776,9 +6725,16 @@ SwigPyBuiltin__Exiv2__PreviewProperties_richcompare(PyObject *self, PyObject *ot
 SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__PreviewProperties_methods[] = {
   { "keys", _wrap_PreviewProperties_keys, METH_NOARGS, "\n"
 		"Get structure member names.\n"
+		"\n"
+		"Return the names used to access members as attributes (``object.name``)\n"
+		"or with dict-like indexing (``object['name']``). Attribute access is\n"
+		"preferred as it is more efficient.\n"
+		"\n"
+		"Although the exiv2 C++ structure member names end with underscores, the\n"
+		"Python interface uses names without underscores.\n"
 		":rtype: tuple of str\n"
-		":return: structure member names (with any trailing underscores\n"
-		"    removed).\n"
+		":return: structure member names.\n"
+		"\n"
 		"" },
   { "values", _wrap_PreviewProperties_values, METH_NOARGS, "\n"
 		"Get structure member values.\n"
@@ -6788,8 +6744,7 @@ SWIGINTERN PyMethodDef SwigPyBuiltin__Exiv2__PreviewProperties_methods[] = {
   { "items", _wrap_PreviewProperties_items, METH_NOARGS, "\n"
 		"Get structure members.\n"
 		":rtype: tuple of (str, value) tuple\n"
-		":return: structure member (name, value) pairs (with any trailing\n"
-		"    underscores removed from names).\n"
+		":return: structure member (name, value) pairs.\n"
 		"" },
   { "__iter__", (PyCFunction)(void(*)(void))_wrap_PreviewProperties___iter__, METH_STATIC|METH_NOARGS, "" },
   { NULL, NULL, 0, NULL } /* Sentinel */