valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More PEP-8

Browse Source
This commit is contained in:
Pedro Algarvio 2012-11-16 22:32:10 +00:00
parent 9110340490
commit efc9a390bd
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/renderers/stateconf.py
View File

@ -187,7 +187,6 @@ import copy
from os import path as ospath
from cStringIO import StringIO
# Import salt libs
import salt.utils
from salt.exceptions import SaltRenderError
@ -195,6 +194,7 @@ from salt.exceptions import SaltRenderError
log = logging.getLogger(__name__)
__opts__ = {
'stateconf_end_marker': r'#\s*-+\s*end of state config\s*-+',
# eg, something like "# --- end of state config --" works by default.
@ -205,9 +205,9 @@ __opts__ = {
'stateconf_state_func': 'stateconf.set'
# names the state and the state function to be recognized as a special
# state from which to gather sls file context variables. It should be
# specified in the 'state.func' notation, and both the state module and the
# function must actually exist and the function should be a dummy, no-op
# state function that simply returns a
# specified in the 'state.func' notation, and both the state module and
# the function must actually exist and the function should be a dummy,
# no-op state function that simply returns a
# dict(name=name, result=True, changes={}, comment='')
}
@ -280,9 +280,11 @@ def render(template_file, env='', sls='', argline='', **kws):
if context:
ctx.update(context)
tmplout = render_template(StringIO(data), env, sls, context=ctx,
argline=rt_argline.strip()
)
tmplout = render_template(
StringIO(data), env, sls, context=ctx,
argline=rt_argline.strip()
)
high = render_data(tmplout, env, sls, argline=rd_argline.strip())
# make a copy so that the original, un-preprocessed highstate data