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

Fixing a few non-salt functions which where showing up in the autodoc

Browse Source 
These were showing up as state module functions:
    - yaml_load
    - YamlCustomLoader
This commit is contained in:
Jeff Schroeder 2012-12-27 21:42:32 -06:00
parent 843e01a7f4
commit 05f9987d57
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/state.py
View File

@ -12,8 +12,8 @@ import json
import salt.utils import salt.utils
import salt.state import salt.state
import salt.payload import salt.payload
from salt.utils.yaml import load as yaml_load from salt.utils.yaml import load as _yaml_load
from salt.utils.yaml import CustomLoader as YamlCustomLoader from salt.utils.yaml import CustomLoader as _YamlCustomLoader
from salt._compat import string_types from salt._compat import string_types
@ -307,7 +307,7 @@ def single(fun, name, test=None, kwval_as='yaml', **kwargs):
if kwval_as == 'yaml': if kwval_as == 'yaml':
def parse_kwval(value): def parse_kwval(value):
return yaml_load(value, YamlCustomLoader) return _yaml_load(value, _YamlCustomLoader)
elif kwval_as == 'json': elif kwval_as == 'json':
def parse_kwval(value): def parse_kwval(value):
return json.loads(value) return json.loads(value)