Move logic to Operation.generate_sphinx()

Author: kleisauke

pyvips/voperation.py

@@ -91,8 +91,8 @@ def add_construct(self, pspec, argument_class,
         self.required_output = []
         self.optional_output = []
 
-        # same, but with deprecated and redundant args filtered out ... this is
-        # the set we show in documentation
+        # same, but with deprecated args filtered out ... this is the set we
+        # show in documentation
         self.doc_optional_input = []
         self.doc_optional_output = []
 
@@ -117,12 +117,7 @@ def add_construct(self, pspec, argument_class,
                     (flags & _REQUIRED) == 0):
                 self.optional_input.append(name)
 
-                # drop "revalidate" flag from buffer loaders and operations
-                # marked "nocache" as they are already uncached
-                if ((flags & _DEPRECATED) == 0 and
-                        (name != 'revalidate' or
-                         ('_buffer' not in operation_name and
-                          (self.flags & _OPERATION_NOCACHE) == 0))):
+                if (flags & _DEPRECATED) == 0:
                     self.doc_optional_input.append(name)
 
             if ((flags & _OUTPUT) != 0 and
@@ -423,14 +418,21 @@ def generate_sphinx(operation_name):
             raise Error('No such operator.',
                         f'operator "{operation_name}" is deprecated')
 
+        # drop "revalidate" flag from buffer loaders and operations marked
+        # "nocache" as they are already uncached
+        doc_optional_input = [name for name in intro.doc_optional_input if
+                              name != 'revalidate' or
+                              ('_buffer' not in operation_name and
+                               (intro.flags & _OPERATION_NOCACHE) == 0)]
+
         if intro.member_x is not None:
             result = '.. method:: '
         else:
             result = '.. staticmethod:: '
         args = []
         args += intro.method_args
         args += [x + '=' + GValue.gtype_to_python(intro.details[x]['type'])
-                 for x in intro.doc_optional_input]
+                 for x in doc_optional_input]
         args += [x + '=bool'
                  for x in intro.doc_optional_output]
         result += operation_name + '(' + ", ".join(args) + ')\n\n'
@@ -449,11 +451,11 @@ def generate_sphinx(operation_name):
         args = []
         args += intro.method_args
         args += [x + '=' + GValue.gtype_to_python(intro.details[x]['type'])
-                 for x in intro.doc_optional_input]
+                 for x in doc_optional_input]
         result += ', '.join(args)
         result += ')\n\n'
 
-        for name in intro.method_args + intro.doc_optional_input:
+        for name in intro.method_args + doc_optional_input:
             details = intro.details[name]
             result += f':param {name}: {details["blurb"]}\n'
             result += (f':type {name}: '