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

Merge pull request #28020 from DSRCompany/issues/27130_loader_deepcopy_fix

Browse source 
LazyLoader deepcopy fix.
This commit is contained in:
Mike Place 2015-10-19 07:17:57 -06:00
commit 07cac0b434
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/loader.py
View file

@ -62,6 +62,9 @@ LIBCLOUD_FUNCS_NOT_SUPPORTED = (
'rackspace.list_locations'
)
# Will be set to pyximport module at runtime if cython is enabled in config.
pyximport = None
def static_loader(
opts,
@ -957,8 +960,9 @@ class LazyLoader(salt.utils.lazy.LazyDict):
if self.opts.get('cython_enable', True) is True:
try:
self.pyximport = __import__('pyximport') # pylint: disable=import-error
self.pyximport.install()
global pyximport
pyximport = __import__('pyximport') # pylint: disable=import-error
pyximport.install()
# add to suffix_map so file_mapping will pick it up
self.suffix_map['.pyx'] = tuple()
except ImportError:
@ -1093,7 +1097,7 @@ class LazyLoader(salt.utils.lazy.LazyDict):
try:
sys.path.append(os.path.dirname(fpath))
if suffix == '.pyx':
mod = self.pyximport.load_module(name, fpath, tempfile.gettempdir())
mod = pyximport.load_module(name, fpath, tempfile.gettempdir())
elif suffix == '.o':
top_mod = __import__(fpath, globals(), locals(), [])
comps = fpath.split('.')