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

Merge pull request #28035 from DSRCompany/issues/do_not_deep_copy_just_to_iterate_keys

Browse Source 
Don't deepcopy just to iterate over dict keys/list items.
This commit is contained in:
Mike Place 2015-10-21 07:17:36 -06:00
commit 7d31adf9b8
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/client/mixins.py
View File

@ -5,7 +5,6 @@ A collection of mixins useful for the various *Client interfaces
# Import Python libs
from __future__ import absolute_import, print_function
import copy
import logging
import weakref
import traceback
@ -73,11 +72,11 @@ class ClientFuncsDict(collections.MutableMapping):
'kwargs': kwargs,
}
pub_data = {}
# Copy kwargs so we can iterate over and pop the pub data
_kwargs = copy.deepcopy(kwargs)
# Copy kwargs keys so we can iterate over and pop the pub data
kwargs_keys = list(kwargs)
# pull out pub_data if you have it
for kwargs_key, kwargs_value in six.iteritems(_kwargs):
for kwargs_key in kwargs_keys:
if kwargs_key.startswith('__pub_'):
pub_data[kwargs_key] = kwargs.pop(kwargs_key)
@ -285,9 +284,9 @@ class SyncClientMixin(object):
# Inject some useful globals to *all* the function's global
# namespace only once per module-- not per func
completed_funcs = []
_functions = copy.deepcopy(self.functions)
_func_keys = list(self.functions)
for mod_name in six.iterkeys(_functions):
for mod_name in _func_keys:
if '.' not in mod_name:
continue
mod, _ = mod_name.split('.', 1)

4
salt/state.py
View File

@ -2157,12 +2157,12 @@ class State(object):
return errors
# Compile and verify the raw chunks
chunks = self.compile_high_data(high)
log.critical("CHUNKS: {0}".format(chunks))
# Check for any disabled states
disabled = {}
if 'state_runs_disabled' in self.opts['grains']:
_chunks = copy.deepcopy(chunks)
for low in _chunks:
for low in chunks[:]:
state_ = '{0}.{1}'.format(low['state'], low['fun'])
for pat in self.opts['grains']['state_runs_disabled']:
if fnmatch.fnmatch(state_, pat):