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

Fix for #16455

Browse Source 
This reverts 5fdd86, which introduced a self-referential dictionary-- which mean that it could never be garbage collected.
This commit is contained in:
Thomas Jackson 2014-10-10 14:16:04 -07:00
parent a85a1a1059
commit 9e000ff512
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
salt/renderers/jinja.py
View File

@ -221,15 +221,9 @@ import salt.utils.templates
log = logging.getLogger(__name__)
class SaltDotLookup(dict):
def __init__(self, *args, **kwargs):
dict.__init__(self, *args, **kwargs)
self.__dict__ = self
def _split_module_dicts(__salt__):
def _split_module_dicts():
'''
Create a dictionary from module.function as module[function]
Create a copy of __salt__ dictionary with module.function and module[function]
Takes advantage of Jinja's syntactic sugar lookup:
@ -237,11 +231,11 @@ def _split_module_dicts(__salt__):
{{ salt.cmd.run('uptime') }}
'''
mod_dict = SaltDotLookup()
for module_func_name in __salt__.keys():
mod, _, fun = module_func_name.partition('.')
mod_dict = dict(__salt__)
for module_func_name, mod_fun in mod_dict.items():
mod, fun = module_func_name.split('.', 1)
mod_dict.setdefault(mod,
SaltDotLookup())[fun] = __salt__[module_func_name]
{})[fun] = mod_fun
return mod_dict
@ -259,12 +253,9 @@ def render(template_file, saltenv='base', sls='', argline='',
'Unknown renderer option: {opt}'.format(opt=argline)
)
salt_dict = SaltDotLookup(**__salt__)
salt_dict.__dict__.update(_split_module_dicts(__salt__))
tmp_data = salt.utils.templates.JINJA(template_file,
to_str=True,
salt=salt_dict,
salt=_split_module_dicts(),
grains=__grains__,
opts=__opts__,
pillar=__pillar__,