pep8
This commit is contained in:
parent
57f15f9cce
commit
f08ac264a0
3 changed files with 6 additions and 3 deletions
|
@ -418,7 +418,8 @@ def parse_and_configure(argv, singleton=True):
|
||||||
parser = get_parsers()
|
parser = get_parsers()
|
||||||
parser_args = parser['main'].parse_args(argv)
|
parser_args = parser['main'].parse_args(argv)
|
||||||
try:
|
try:
|
||||||
cfg = cdist.configuration.Configuration(parser_args, singleton=singleton)
|
cfg = cdist.configuration.Configuration(parser_args,
|
||||||
|
singleton=singleton)
|
||||||
args = cfg.get_args()
|
args = cfg.get_args()
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
raise cdist.Error(str(e))
|
raise cdist.Error(str(e))
|
||||||
|
|
|
@ -114,7 +114,8 @@ class Manifest(object):
|
||||||
}
|
}
|
||||||
|
|
||||||
self.env.update(
|
self.env.update(
|
||||||
{'__cdist_loglevel': logging.getLevelName(self.log.getEffectiveLevel())})
|
{'__cdist_loglevel': logging.getLevelName(
|
||||||
|
self.log.getEffectiveLevel())})
|
||||||
|
|
||||||
def _open_logger(self):
|
def _open_logger(self):
|
||||||
self.log = logging.getLogger(self.target_host[0])
|
self.log = logging.getLogger(self.target_host[0])
|
||||||
|
|
|
@ -378,7 +378,8 @@ class ConfigurationTestCase(test.CdistTestCase):
|
||||||
|
|
||||||
# bypass singleton so we can test further
|
# bypass singleton so we can test further
|
||||||
cc.Configuration.instance = None
|
cc.Configuration.instance = None
|
||||||
configuration = cc.Configuration(args, env=env, config_files=('cdist.cfg'))
|
configuration = cc.Configuration(args, env=env,
|
||||||
|
config_files=('cdist.cfg'))
|
||||||
self.assertIsNotNone(configuration.args)
|
self.assertIsNotNone(configuration.args)
|
||||||
self.assertIsNotNone(configuration.env)
|
self.assertIsNotNone(configuration.env)
|
||||||
self.assertIsNotNone(configuration.config_files)
|
self.assertIsNotNone(configuration.config_files)
|
||||||
|
|
Loading…
Reference in a new issue