Avoid generating redundant enums

Author: kleisauke

examples/gen-enums.py

@@ -4,7 +4,7 @@
 import xml.etree.ElementTree as ET
 
 from pyvips import ffi, enum_dict, flags_dict, \
-    vips_lib, type_map, type_name, type_from_name
+    type_map, type_name, type_from_name
 
 # This file generates enums.py -- the set of classes giving the permissible
 # values for the pyvips enums/flags. Run with something like:
@@ -103,10 +103,6 @@ def add_nickname(gtype, a, b):
 
     type_map(type_from_name('GEnum'), add_nickname)
 
-    # Filter internal enums
-    blacklist = ['VipsImageType', 'VipsToken']
-    all_nicknames = [name for name in all_nicknames if name not in blacklist]
-
     for name in all_nicknames:
         gtype = type_from_name(name)
         python_name = remove_prefix(name)
@@ -198,11 +194,6 @@ def add_nickname(gtype, a, b):
 
 
 if __name__ == "__main__":
-    # otherwise we're missing some enums
-    vips_lib.vips_token_get_type()
-    vips_lib.vips_saveable_get_type()
-    vips_lib.vips_image_type_get_type()
-
     print('# libvips enums -- this file is generated automatically')
     print('# flake8: noqa: E501')  # ignore line too long error
     generate_enums()

pyvips/enums.py

@@ -1425,33 +1425,3 @@ class ForeignPngFilter(object):
     AVG = 64
     PAETH = 128
     ALL = 248
-
-
-class ForeignSaveable(object):
-    """ForeignSaveable.
-
-The set of image types supported by a saver.
-
-::: seealso
-    :class:`.ForeignSave`.
-
-Attributes:
-
-    ANY (int): saver supports everything (eg. TIFF)
-
-    MONO (int): 1 band
-
-    RGB (int): 3 bands
-
-    CMYK (int): 4 bands
-
-    ALPHA (int): an extra band
-
-    """
-
-    ANY = 0
-    MONO = 1
-    RGB = 2
-    CMYK = 4
-    ALPHA = 8
-    ALL = 15

pyvips/vdecls.py

@@ -135,9 +135,6 @@ def cdefs(features):
         GType vips_interpretation_get_type (void);
         GType vips_operation_flags_get_type (void);
         GType vips_band_format_get_type (void);
-        GType vips_token_get_type (void);
-        GType vips_saveable_get_type (void);
-        GType vips_image_type_get_type (void);
 
         typedef ... GData;