Re-factor the option parsing following a suggestion from Greg.
Eliminate the <topic>.parse altogether.

Signed-off-by: Jean-Marc Eurin <jmeurin@google.com>


git-svn-id: http://test.kernel.org/svn/autotest/trunk@3081 592f7852-d20e-0410-864c-8624ca9c26a4

cli/user.py

diff --git a/cli/user.py b/cli/user.py
index 8257c79..0e4fd49 100755
--- a/cli/user.py
+++ b/cli/user.py
@@ -36,14 +36,10 @@
                                default=None,
                                metavar='USER_FLIST')
 
-
-    def parse(self, flists=None, req_items='users'):
-        """Consume the common user options"""
-        if flists:
-            flists.append(('users', 'ulist', '', True))
-        else:
-            flists = [('users', 'ulist', '', True)]
-        return self.parse_with_flist(flists, req_items)
+        self.topic_parse_info = topic_common.item_parse_info(
+            attribute_name='users',
+            filename_option='ulist',
+            use_leftover=True)
 
 
     def get_items(self):
@@ -70,7 +66,7 @@
 
 
     def parse(self):
-        (options, leftover) = super(user_list, self).parse(req_items=None)
+        (options, leftover) = super(user_list, self).parse()
         self.acl = options.acl
         self.access_level = options.access_level
         return (options, leftover)