doc: Clean up signature generation a bit more

Use join and a genexp instead of manual comma tracking to make
our lives just a little easier.

diff --git a/giscanner/mallard-Python-function.tmpl b/giscanner/mallard-Python-function.tmpl
index 03a3e39..5ccc800 100644 (file)
--- a/giscanner/mallard-Python-function.tmpl
+++ b/giscanner/mallard-Python-function.tmpl
@@ -45,12 +45,7 @@ elif node.is_method:
 <synopsis><code mime="text/x-python">
 % if len(node.parameters) != 0:
 @accepts(\
-% for arg, ix in zip(node.parameters, range(len(node.parameters))):
-${formatter.format_type(arg.type) | x}\
-% if ix != len(node.parameters) - 1:
-, \
-%endif
-% endfor
+${', '.join((formatter.format_type(arg.type) for arg in node.parameters))}\
 )
 % endif
 @returns(${formatter.format_type(node.retval.type) | x})
@@ -59,12 +54,7 @@ ${node.name}(\
 % if node.is_method:
 self, \
 % endif
-% for arg, ix in zip(node.parameters, range(len(node.parameters))):
-${arg.argname}\
-% if ix != len(node.parameters) - 1:
-, \
-%endif
-% endfor
+${', '.join((arg.argname for arg in node.parameters))}\
 ):
     # Python wrapper for ${node.symbol}()
 </code></synopsis>

diff --git a/giscanner/mallard-Python-vfunc.tmpl b/giscanner/mallard-Python-vfunc.tmpl
index 4c7ab8f..0c93abb 100644 (file)
--- a/giscanner/mallard-Python-vfunc.tmpl
+++ b/giscanner/mallard-Python-vfunc.tmpl
@@ -13,23 +13,13 @@
 <synopsis><code mime="text/x-python">
 % if len(node.parameters) != 0:
 @accepts(\
-% for arg, ix in zip(node.parameters, range(len(node.parameters))):
-${formatter.format_type(arg.type) | x}\
-% if ix != len(node.parameters) - 1:
-, \
-%endif
-% endfor
+${', '.join((formatter.format_type(arg.type) for arg in node.parameters))}\
 )
 % endif
 @returns(${formatter.format_type(node.retval.type) | x})
 def \
 do_${node.name}(self, \
-% for arg, ix in zip(node.parameters, range(len(node.parameters))):
-${arg.argname}\
-% if ix != len(node.parameters) - 1:
-, \
-%endif
-% endfor
+${', '.join((arg.argname for arg in node.parameters))}\
 ):
 </code></synopsis>
 ${formatter.format(node, node.doc)}