Avoid subtracting -1 from the number of possible enum values

Author: kleisauke

pyvips/base.py

@@ -117,9 +117,12 @@ def values_for_enum(gtype):
     g_type_class = gobject_lib.g_type_class_ref(gtype)
     g_enum_class = ffi.cast('GEnumClass *', g_type_class)
 
-    # -1 since we always have a "last" member.
-    return [_to_string(g_enum_class.values[i].value_nick)
-            for i in range(g_enum_class.n_values - 1)]
+    result = [_to_string(g_enum_class.values[i].value_nick)
+              for i in range(g_enum_class.n_values)]
+    # FIXME(kleisauke): remove after https://github.com/libvips/libvips/pull/4520
+    if 'last' in result:
+        result.remove('last')
+    return result
 
 
 def values_for_flag(gtype):
@@ -138,10 +141,12 @@ def enum_dict(gtype):
     g_type_class = gobject_lib.g_type_class_ref(gtype)
     g_enum_class = ffi.cast('GEnumClass *', g_type_class)
 
-    # -1 since we always have a "last" member.
-    return {_to_string(g_enum_class.values[i].value_nick):
-            g_enum_class.values[i].value
-            for i in range(g_enum_class.n_values - 1)}
+    result = {_to_string(g_enum_class.values[i].value_nick):
+                  g_enum_class.values[i].value
+              for i in range(g_enum_class.n_values)}
+    # FIXME(kleisauke): remove after https://github.com/libvips/libvips/pull/4520
+    result.pop('last', None)
+    return result
 
 
 def flags_dict(gtype):