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

PY3: Make loader ignore .pyc files not in __pycache__

Browse Source 
This keeps the loader from loading a PY2 .pyc file if it is present.
This commit is contained in:
Erik Johnson 2017-12-19 21:41:02 -06:00
parent 8c360dd3fb
commit 4951b9a60d
No known key found for this signature in database
GPG Key ID: 5E5583C437808F3F
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
salt/loader.py
View File

@ -78,15 +78,18 @@ if USE_IMPORTLIB:
else: else:
SUFFIXES = imp.get_suffixes() SUFFIXES = imp.get_suffixes()
BIN_PRE_EXT = '' if six.PY2 \
else '.cpython-{0}{1}'.format(sys.version_info.major, sys.version_info.minor)
# Because on the cloud drivers we do `from salt.cloud.libcloudfuncs import *` # Because on the cloud drivers we do `from salt.cloud.libcloudfuncs import *`
# which simplifies code readability, it adds some unsupported functions into # which simplifies code readability, it adds some unsupported functions into
# the driver's module scope. # the driver's module scope.
# We list un-supported functions here. These will be removed from the loaded. # We list un-supported functions here. These will be removed from the loaded.
# TODO: remove the need for this cross-module code. Maybe use NotImplemented # TODO: remove the need for this cross-module code. Maybe use NotImplemented
LIBCLOUD_FUNCS_NOT_SUPPORTED = ( LIBCLOUD_FUNCS_NOT_SUPPORTED = (
u'parallels.avail_sizes', 'parallels.avail_sizes',
u'parallels.avail_locations', 'parallels.avail_locations',
u'proxmox.avail_sizes', 'proxmox.avail_sizes',
) )
# Will be set to pyximport module at runtime if cython is enabled in config. # Will be set to pyximport module at runtime if cython is enabled in config.
@ -987,7 +990,7 @@ def _generate_module(name):
if name in sys.modules: if name in sys.modules:
return return
code = u"'''Salt loaded {0} parent module'''".format(name.split('.')[-1]) code = "'''Salt loaded {0} parent module'''".format(name.split('.')[-1])
# ModuleType can't accept a unicode type on PY2 # ModuleType can't accept a unicode type on PY2
module = types.ModuleType(str(name)) # future lint: disable=blacklisted-function module = types.ModuleType(str(name)) # future lint: disable=blacklisted-function
exec(code, module.__dict__) exec(code, module.__dict__)
@ -1196,6 +1199,7 @@ class LazyLoader(salt.utils.lazy.LazyDict):
self.suffix_map = {} self.suffix_map = {}
suffix_order = [''] # local list to determine precedence of extensions suffix_order = [''] # local list to determine precedence of extensions
# Prefer packages (directories) over modules (single files)! # Prefer packages (directories) over modules (single files)!
for (suffix, mode, kind) in SUFFIXES: for (suffix, mode, kind) in SUFFIXES:
self.suffix_map[suffix] = (suffix, mode, kind) self.suffix_map[suffix] = (suffix, mode, kind)
suffix_order.append(suffix) suffix_order.append(suffix)
@ -1224,19 +1228,31 @@ class LazyLoader(salt.utils.lazy.LazyDict):
self.file_mapping = salt.utils.odict.OrderedDict() self.file_mapping = salt.utils.odict.OrderedDict()
for mod_dir in self.module_dirs: for mod_dir in self.module_dirs:
files = []
try: try:
# Make sure we have a sorted listdir in order to have expectable override results # Make sure we have a sorted listdir in order to have
# expectable override results
files = sorted(os.listdir(mod_dir)) files = sorted(os.listdir(mod_dir))
except OSError: except OSError:
continue # Next mod_dir continue # Next mod_dir
if six.PY3 and '__pycache__' in files:
try:
pycache_files = [
os.path.join('__pycache__', x) for x in
sorted(os.listdir(os.path.join(mod_dir, '__pycache__')))
]
except OSError:
pass
else:
files = pycache_files + files
for filename in files: for filename in files:
try: try:
if filename.startswith('_'): dirname, basename = os.path.split(filename)
if basename.startswith('_'):
# skip private modules # skip private modules
# log messages omitted for obviousness # log messages omitted for obviousness
continue # Next filename continue # Next filename
f_noext, ext = os.path.splitext(filename) f_noext, ext = os.path.splitext(basename)
f_noext = f_noext.replace(BIN_PRE_EXT, '')
# make sure it is a suffix we support # make sure it is a suffix we support
if ext not in self.suffix_map: if ext not in self.suffix_map:
continue # Next filename continue # Next filename
@ -1272,6 +1288,12 @@ class LazyLoader(salt.utils.lazy.LazyDict):
if not curr_ext or suffix_order.index(ext) >= suffix_order.index(curr_ext): if not curr_ext or suffix_order.index(ext) >= suffix_order.index(curr_ext):
continue # Next filename continue # Next filename
if six.PY3 and not dirname and ext == '.pyc':
# On Python 3, we should only load .pyc files from the
# __pycache__ subdirectory (i.e. when dirname is not an
# empty string).
continue
# Made it this far - add it # Made it this far - add it
self.file_mapping[f_noext] = (fpath, ext) self.file_mapping[f_noext] = (fpath, ext)