Use new API for cliapp settings.

1 files changed, 44 insertions, 47 deletions

diff --git a/seivot b/seivot
index b532229..f44e94e 100755
--- a/seivot
+++ b/seivot
@@ -298,54 +298,51 @@ class Seivot(cliapp.Application):
     def add_settings(self):
         self.factory = BackupProgramFactory()
 
-        self.settings.add_choice_setting(['program'], self.factory.names(),
-                                         'program to benchmark (%default)')
-
-        self.settings.add_integer_setting(['generations'],
-                                          'total number of generations to '
-                                            'measure (%default)',
-                                          metavar='COUNT',
-                                          default=5)
-        self.settings.add_bytesize_setting(['initial-data'],
-                                           'size of initial live data '
-                                                '(%default)',
-                                           metavar='SIZE',
-                                           default=1024)
-        self.settings.add_bytesize_setting(['incremental-data'],
-                                           'add SIZE live data for '
-                                                'additional generations '
-                                                '(%default)',
-                                           metavar='SIZE',
-                                           default=1024)
-
-        self.settings.add_string_setting(['obnam-branch'],
-                                         'bzr branch from which to run obnam '
-                                            '(default is installed obnam)')
-        self.settings.add_string_setting(['larch-branch'],
-                                         'bzr branch from which to use larch '
-                                            '(default is installed larch)')
-        self.settings.add_string_setting(['obnam-profile'],
-                                          'store Python profiling output '
-                                            'in files named after NAMEPATTERN '
-                                            '(no profiling, unless set); '
-                                            '%(foo)s in pattern gets filled '
-                                            'in, where foo is op (for '
-                                            'backup/restore/etc), gen, or '
-                                            'order (cumulative/time)',
-                                          metavar='NAMEPATTERN',
-                                          default='')
-        self.settings.add_string_setting(['encrypt-with'],
-                                         'encrypt backups with KEYID',
-                                         metavar='KEYID')
+        self.settings.choice(['program'], self.factory.names(),
+                             'program to benchmark (%default)')
+
+        self.settings.integer(['generations'],
+                              'total number of generations to '
+                                'measure (%default)',
+                               metavar='COUNT',
+                               default=5)
+        self.settings.bytesize(['initial-data'],
+                               'size of initial live data (%default)',
+                               metavar='SIZE',
+                               default=1024)
+        self.settings.bytesize(['incremental-data'],
+                               'add SIZE live data for '
+                                    'additional generations '
+                                    '(%default)',
+                               metavar='SIZE',
+                               default=1024)
+        self.settings.string(['obnam-branch'],
+                             'bzr branch from which to run obnam '
+                                '(default is installed obnam)')
+        self.settings.string(['larch-branch'],
+                             'bzr branch from which to use larch '
+                                '(default is installed larch)')
+        self.settings.string(['obnam-profile'],
+                             'store Python profiling output '
+                                'in files named after NAMEPATTERN '
+                                '(no profiling, unless set); '
+                                '%(foo)s in pattern gets filled '
+                                'in, where foo is op (for '
+                                'backup/restore/etc), gen, or '
+                                'order (cumulative/time)',
+                              metavar='NAMEPATTERN',
+                              default='')
+        self.settings.string(['encrypt-with'],
+                             'encrypt backups with KEYID',
+                             metavar='KEYID')
                                          
-        self.settings.add_boolean_setting(['drop-caches'],
-                                         'clear Linux kernel cache before '
-                                           'running commands (will ask for '
-                                           'sudo pasword')
-
-        self.settings.add_boolean_setting(['use-sftp'],
-                                          'access backup repository over the '
-                                            'network via sftp')
+        self.settings.boolean(['drop-caches'],
+                             'clear Linux kernel cache before '
+                               'running commands (will ask for sudo pasword')
+
+        self.settings.boolean(['use-sftp'],
+                              'access backup repository over the '
+                                'network via sftp')
 
     def process_args(self, args):
         progname = self.settings['program']