diff --git a/src/calibre/utils/config_base.py b/src/calibre/utils/config_base.py index a9860b60fa..c099574cb0 100644 --- a/src/calibre/utils/config_base.py +++ b/src/calibre/utils/config_base.py @@ -116,7 +116,6 @@ class OptionSet(object): if name in self.preferences: self.preferences.remove(name) - def add_opt(self, name, switches=[], help=None, type=None, choices=None, group=None, default=None, action=None, metavar=None): ''' @@ -174,7 +173,6 @@ class OptionSet(object): ) g.add_option(*pref.switches, **args) - return parser def get_override_section(self, src): @@ -230,7 +228,7 @@ class OptionSet(object): def serialize(self, opts): src = '# %s\n\n'%(self.description.replace('\n', '\n# ')) - groups = [self.render_group(name, self.groups.get(name, ''), opts) \ + groups = [self.render_group(name, self.groups.get(name, ''), opts) for name in [None] + self.group_list] return src + '\n\n'.join(groups) @@ -265,7 +263,6 @@ class Config(ConfigInterface): ConfigInterface.__init__(self, description) self.config_file_path = os.path.join(config_dir, basename+'.py') - def parse(self): src = '' if os.path.exists(self.config_file_path): @@ -369,7 +366,6 @@ class ConfigProxy(object): return self.__config.get_option(key).help - def _prefs(): c = Config('global', 'calibre wide preferences') c.add_opt('database_path',