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

To avoid any future confusion, we'll use __load__ instead of __all__.

Browse Source
This commit is contained in:
Pedro Algarvio 2013-02-18 23:57:27 +00:00
parent 3edd841b33
commit 7173454233
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
salt/loader.py
View File

@ -430,11 +430,18 @@ class Loader(object):
except TypeError:
pass
funcs = {}
mod_provides_all = hasattr(mod, '__all__')
for attr in getattr(mod, '__all__', dir(mod)):
if attr.startswith('_') and not mod_provides_all:
# private functions are skipped if not provided in that
# module's __all__
mod_name = mod.__name__[mod.__name__.rindex('.') + 1:]
mod_provides_load = hasattr(mod, '__load__')
if mod_provides_load:
log.info(
'The functions from module {0!r} are being loaded from the '
'provided __load__ attribute'.format(
mod_name
)
)
for attr in getattr(mod, '__load__', dir(mod)):
if attr.startswith('_'):
# private functions are skipped
continue
if callable(getattr(mod, attr)):
func = getattr(mod, attr)
@ -443,11 +450,7 @@ class Loader(object):
# the callable object is an exception, don't load it
continue
funcs[
'{0}.{1}'.format(
mod.__name__[mod.__name__.rindex('.') + 1:], attr
)
] = func
funcs['{0}.{1}'.format(mod_name, attr)] = func
self._apply_outputter(func, mod)
if not hasattr(mod, '__salt__'):
mod.__salt__ = functions