saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename klass to valtype

Browse source
This commit is contained in:
Colton Myers 2015-05-26 10:40:37 -06:00
parent 89cdf976e1
commit d8a84b3017
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/utils/dictupdate.py
View file

@ -21,10 +21,10 @@ def update(dest, upd):
for key, val in six.iteritems(upd):
try:
if isinstance(val, OrderedDict):
klass = OrderedDict
valtype = OrderedDict
else:
klass = dict
dest_subkey = dest.get(key, klass())
valtype = dict
dest_subkey = dest.get(key, valtype())
except AttributeError:
dest_subkey = None
if isinstance(dest_subkey, collections.Mapping) \