From eac52c270b8b3b10e461bc46502b64c5f898bd7d Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 7 Oct 2009 14:46:08 +0000 Subject: Pylint/PEP 8 Code cleanups Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5477 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Options.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/lib/Options.py') diff --git a/src/lib/Options.py b/src/lib/Options.py index b61fea808..1e4ce7aef 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -22,6 +22,7 @@ DEFAULT_INSTALL_PREFIX = '/usr' #/usr class Option(object): cfpath = DEFAULT_CONFIG_LOCATION __cfp = False + def getCFP(self): if not self.__cfp: self.__cfp = ConfigParser.ConfigParser() @@ -36,7 +37,7 @@ class Option(object): return self.cook(value) else: return value - + def __init__(self, desc, default, cmd=False, odesc=False, env=False, cf=False, cook=False, long_arg=False): self.desc = desc @@ -121,7 +122,7 @@ class OptionSet(dict): def __init__(self, *args): dict.__init__(self, *args) self.hm = self.buildHelpMessage() - + def buildGetopt(self): return ''.join([opt.buildGetopt() for opt in list(self.values())]) @@ -191,7 +192,7 @@ MDATA_PARANOID = Option('Default ConfigFile paranoid setting', SERVER_REPOSITORY = Option('Server repository path', '/var/lib/bcfg2', cf=('server', 'repository'), cmd='-Q', - odesc='' ) + odesc='') SERVER_PLUGINS = Option('Server plugin list', cf=('server', 'plugins'), # default server plugins default=[ @@ -299,7 +300,7 @@ LOGGING_FILE_PATH = Option('Set path of file log', default=None, cmd='-o', odesc='', cf=('logging', 'path')) CLIENT_SERVICE_MODE = Option('Set client service mode', default='default', - cmd='-s', odesc='') + cmd='-s', odesc='') class OptionParser(OptionSet): -- cgit v1.2.3-1-g7c22