Remove empty data from enum docstrings file

Author: jim-easterbrook

src/interface/extras.py

@@ -63,16 +63,15 @@ def _deprecated_enum(moved_to, new_enum):
 
 
 def _create_enum(module, name, alias_strip, members):
-    data = enum_data[name]
     if alias_strip:
         alias_strip = int(alias_strip)
         members += [(k[alias_strip:], v) for (k, v) in members]
     result = enum.IntEnum(name.split('::')[-1], members)
     result.__module__ = 'exiv2.' + module[1:]
+    data = enum_data[name]
     if data['doc']:
         result.__doc__ = data['doc']
     for key, value in data['values'].items():
-        if value['doc']:
-            result[key].__doc__ = value['doc']
+        result[key].__doc__ = value
     return result
 

src/interface/shared/static_list.i

@@ -1,6 +1,6 @@
 // python-exiv2 - Python interface to libexiv2
 // http://github.com/jim-easterbrook/python-exiv2
-// Copyright (C) 2023-24  Jim Easterbrook  [email protected]
+// Copyright (C) 2023-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

src/swig-0_27_7/_enum_data.py

@@ -63,16 +63,15 @@ def _deprecated_enum(moved_to, new_enum):
 
 
 def _create_enum(module, name, alias_strip, members):
-    data = enum_data[name]
     if alias_strip:
         alias_strip = int(alias_strip)
         members += [(k[alias_strip:], v) for (k, v) in members]
     result = enum.IntEnum(name.split('::')[-1], members)
     result.__module__ = 'exiv2.' + module[1:]
+    data = enum_data[name]
     if data['doc']:
         result.__doc__ = data['doc']
     for key, value in data['values'].items():
-        if value['doc']:
-            result[key].__doc__ = value['doc']
+        result[key].__doc__ = value
     return result
 

src/swig-0_27_7/extras.py

@@ -63,16 +63,15 @@ def _deprecated_enum(moved_to, new_enum):
 
 
 def _create_enum(module, name, alias_strip, members):
-    data = enum_data[name]
     if alias_strip:
         alias_strip = int(alias_strip)
         members += [(k[alias_strip:], v) for (k, v) in members]
     result = enum.IntEnum(name.split('::')[-1], members)
     result.__module__ = 'exiv2.' + module[1:]
+    data = enum_data[name]
     if data['doc']:
         result.__doc__ = data['doc']
     for key, value in data['values'].items():
-        if value['doc']:
-            result[key].__doc__ = value['doc']
+        result[key].__doc__ = value
     return result
 

src/swig-0_28_7/_enum_data.py

@@ -122,16 +122,6 @@ def main():
                     enum_data[name]['values'][value.findtext('name')] = {
                         'doc': get_description(value)}
     # create output dir
-    output_dir = os.path.join('src', 'swig-{}_{}_{}'.format(*exiv2_version))
-    os.makedirs(output_dir, exist_ok=True)
-    # save result
-    with open(os.path.join(output_dir, '_enum_data.py'), 'w') as df:
-        df.write('''# This file was generated by utils/extract_enums.py
-# Do not make changes to this file.
-
-enum_data = ''')
-        df.write(pprint.pformat(enum_data, width=75))
-    # create output dir
     output_dir = os.path.join(
         'src', 'interface', '{}_{}_{}'.format(*exiv2_version))
     os.makedirs(output_dir, exist_ok=True)
@@ -156,6 +146,21 @@ def main():
 };
 }
 ''')
+    # purge data of nearly everything but non-empty doc strings
+    for data in enum_data.values():
+        del data['strong']
+        data['values'] = dict(
+            (k, v['doc']) for (k, v) in data['values'].items() if v['doc'])
+    # create output dir
+    output_dir = os.path.join('src', 'swig-{}_{}_{}'.format(*exiv2_version))
+    os.makedirs(output_dir, exist_ok=True)
+    # save result
+    with open(os.path.join(output_dir, '_enum_data.py'), 'w') as df:
+        df.write('''# This file was generated by utils/extract_enums.py
+# Do not make changes to this file.
+
+enum_data = ''')
+        df.write(pprint.pformat(enum_data, width=75))
     return 0