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

Merge pull request #8657 from cvrebert/patch-2

Browse Source 
map -> map_, to avoid shadowing built-in map() func
This commit is contained in:
Pedro Algarvio 2013-11-19 17:14:51 -08:00
commit 38a229503c
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/cloud/__init__.py
View File

@ -1074,10 +1074,10 @@ class Map(Cloud):
temp_ = Template(fp.read())
# render as yaml
yaml_str_ = temp_.render()
map = yaml.safe_load(yaml_str_)
map_ = yaml.safe_load(yaml_str_)
except MakoException:
map = yaml.safe_load(fp.read())
return map
map_ = yaml.safe_load(fp.read())
return map_
def read(self):
'''