pep8
This commit is contained in:
parent
aba8dc4965
commit
05084c6fc6
2 changed files with 4 additions and 2 deletions
|
@ -97,7 +97,8 @@ class CdistEntityError(Error):
|
||||||
def stderr(self):
|
def stderr(self):
|
||||||
output = []
|
output = []
|
||||||
for stderr_name, stderr_path in self.stderr_paths:
|
for stderr_name, stderr_path in self.stderr_paths:
|
||||||
if os.path.exists(stderr_path) and os.path.getsize(stderr_path) > 0:
|
if (os.path.exists(stderr_path) and
|
||||||
|
os.path.getsize(stderr_path) > 0):
|
||||||
label_begin = '---- BEGIN ' + stderr_name + ':stderr ----'
|
label_begin = '---- BEGIN ' + stderr_name + ':stderr ----'
|
||||||
label_end = '---- END ' + stderr_name + ':stderr ----'
|
label_end = '---- END ' + stderr_name + ':stderr ----'
|
||||||
output.append('\n' + label_begin)
|
output.append('\n' + label_begin)
|
||||||
|
|
|
@ -278,7 +278,8 @@ class Configuration(metaclass=Singleton):
|
||||||
_dist_config_file = os.path.join(
|
_dist_config_file = os.path.join(
|
||||||
os.path.abspath(os.path.join(os.path.dirname(cdist.__file__), "conf")),
|
os.path.abspath(os.path.join(os.path.dirname(cdist.__file__), "conf")),
|
||||||
'cdist.cfg')
|
'cdist.cfg')
|
||||||
default_config_files = (_global_config_file, _dist_config_file, _local_config_file, )
|
default_config_files = (_global_config_file, _dist_config_file,
|
||||||
|
_local_config_file, )
|
||||||
ENV_VAR_CONFIG_FILE = 'CDIST_CONFIG_FILE'
|
ENV_VAR_CONFIG_FILE = 'CDIST_CONFIG_FILE'
|
||||||
|
|
||||||
VERBOSITY_VALUES = _VERBOSITY_VALUES
|
VERBOSITY_VALUES = _VERBOSITY_VALUES
|
||||||
|
|
Loading…
Reference in a new issue