trivial: Use names for options with multiple=True

Signed-off-by: Stephen Finucane <stephen@that.guru>

Author: stephenfin

git_pw/bundle.py

@@ -114,29 +114,29 @@ def show_cmd(fmt, bundle_id):
 
 
 @click.command(name='list')
-@click.option('--owner', metavar='OWNER', multiple=True,
+@click.option('--owner', 'owners', metavar='OWNER', multiple=True,
               help='Show only bundles with these owners. Should be an email, '
               'name or ID. Private bundles of other users will not be shown.')
 @utils.pagination_options(sort_fields=_sort_fields, default_sort='name')
 @utils.format_options(headers=_list_headers)
 @click.argument('name', required=False)
 @api.validate_multiple_filter_support
-def list_cmd(owner, limit, page, sort, fmt, headers, name):
+def list_cmd(owners, limit, page, sort, fmt, headers, name):
     """List bundles.
 
     List bundles on the Patchwork instance.
     """
     LOG.debug('List bundles: owners=%s, limit=%r, page=%r, sort=%r',
-              ','.join(owner), limit, page, sort)
+              ','.join(owners), limit, page, sort)
 
     params = []
 
-    for own in owner:
+    for owner in owners:
         # we support server-side filtering by username (but not email) in 1.1
-        if (api.version() >= (1, 1) and '@' not in own) or own.isdigit():
-            params.append(('owner', own))
+        if (api.version() >= (1, 1) and '@' not in owner) or owner.isdigit():
+            params.append(('owner', owner))
         else:
-            params.extend(api.retrieve_filter_ids('users', 'owner', own))
+            params.extend(api.retrieve_filter_ids('users', 'owner', owner))
 
     params.extend([
         ('q', name),

git_pw/patch.py

@@ -190,15 +190,15 @@ def update_cmd(patch_ids, commit_ref, state, delegate, archived, fmt):
 
 
 @click.command(name='list')
-@click.option('--state', metavar='STATE', multiple=True,
+@click.option('--state', 'states', metavar='STATE', multiple=True,
               default=['under-review', 'new'],
               help='Show only patches matching these states. Should be '
               'slugified representations of states. The available states '
               'are instance dependant.')
-@click.option('--submitter', metavar='SUBMITTER', multiple=True,
+@click.option('--submitter', 'submitters', metavar='SUBMITTER', multiple=True,
               help='Show only patches by these submitters. Should be an '
               'email, name or ID.')
-@click.option('--delegate', metavar='DELEGATE', multiple=True,
+@click.option('--delegate', 'delegates', metavar='DELEGATE', multiple=True,
               help='Show only patches with these delegates. Should be an '
               'email or username.')
 @click.option('--hash', 'hashes', metavar='HASH', multiple=True,
@@ -209,34 +209,43 @@ def update_cmd(patch_ids, commit_ref, state, delegate, archived, fmt):
 @utils.format_options(headers=_list_headers)
 @click.argument('name', required=False)
 @api.validate_multiple_filter_support
-def list_cmd(state, submitter, delegate, hashes, archived, limit, page, sort,
-             fmt, headers, name):
+def list_cmd(states, submitters, delegates, hashes, archived, limit, page,
+             sort, fmt, headers, name):
     """List patches.
 
     List patches on the Patchwork instance.
     """
     LOG.debug('List patches: states=%s, submitters=%s, delegates=%s, '
-              'hashes=%s, archived=%r', ','.join(state), ','.join(submitter),
-              ','.join(delegate), ','.join(hashes), archived)
+              'hashes=%s, archived=%r', ','.join(states), ','.join(submitters),
+              ','.join(delegates), ','.join(hashes), archived)
 
     params = []
 
-    for state in state:
+    for state in states:
         params.append(('state', state))
 
-    for subm in submitter:
-        # we support server-side filtering by email (but not name) in 1.1
-        if (api.version() >= (1, 1) and '@' in subm) or subm.isdigit():
-            params.append(('submitter', subm))
+    for submitter in submitters:
+        if submitter.isdigit():
+            params.append(('submitter', submitter))
         else:
-            params.extend(api.retrieve_filter_ids('people', 'submitter', subm))
-
-    for delg in delegate:
-        # we support server-side filtering by username (but not email) in 1.1
-        if (api.version() >= (1, 1) and '@' not in delg) or delg.isdigit():
-            params.append(('delegate', delg))
+            # we support server-side filtering by email (but not name) in 1.1
+            if api.version() >= (1, 1) and '@' in submitter:
+                params.append(('submitter', submitter))
+            else:
+                params.extend(
+                    api.retrieve_filter_ids('people', 'submitter', submitter))
+
+    for delegate in delegates:
+        if delegate.isdigit():
+            params.append(('delegate', delegate))
         else:
-            params.extend(api.retrieve_filter_ids('users', 'delegate', delg))
+            # we support server-side filtering by username (but not email) in
+            # 1.1
+            if api.version() >= (1, 1) and '@' not in delegate:
+                params.append(('delegate', delegate))
+            else:
+                params.extend(
+                    api.retrieve_filter_ids('users', 'delegate', delegate))
 
     for hash_ in hashes:
         params.append(('hash', hash_))

git_pw/series.py

@@ -95,29 +95,33 @@ def _format_submission(submission):
 
 
 @click.command(name='list')
-@click.option('--submitter', metavar='SUBMITTER', multiple=True,
+@click.option('--submitter', 'submitters', metavar='SUBMITTER', multiple=True,
               help='Show only series by these submitters. Should be an '
               'email, name or ID.')
 @utils.pagination_options(sort_fields=_sort_fields, default_sort='-date')
 @utils.format_options(headers=_list_headers)
 @click.argument('name', required=False)
 @api.validate_multiple_filter_support
-def list_cmd(submitter, limit, page, sort, fmt, headers, name):
+def list_cmd(submitters, limit, page, sort, fmt, headers, name):
     """List series.
 
     List series on the Patchwork instance.
     """
     LOG.debug('List series: submitters=%s, limit=%r, page=%r, sort=%r',
-              ','.join(submitter), limit, page, sort)
+              ','.join(submitters), limit, page, sort)
 
     params = []
 
-    for subm in submitter:
-        # we support server-side filtering by email (but not name) in 1.1
-        if (api.version() >= (1, 1) and '@' in subm) or subm.isdigit():
-            params.append(('submitter', subm))
+    for submitter in submitters:
+        if submitter.isdigit():
+            params.append(('submitter', submitter))
         else:
-            params.extend(api.retrieve_filter_ids('people', 'submitter', subm))
+            # we support server-side filtering by email (but not name) in 1.1
+            if api.version() >= (1, 1) and '@' in submitter:
+                params.append(('submitter', submitter))
+            else:
+                params.extend(
+                    api.retrieve_filter_ids('people', 'submitter', submitter))
 
     params.extend([
         ('q', name),