Thomas Jackson
8a1ef674ab
Misc cleanup
2015-02-07 11:58:56 -08:00
Thomas Jackson
d539380266
Cleanup FunctionWrapper
2015-02-07 11:58:56 -08:00
Thomas Jackson
e55919b0d1
Remove unecessary format, a string is always a string
2015-02-07 11:58:53 -08:00
Thomas Jackson
69f3f3dd0f
Move "pack" over to a dict
...
Since it doesn't make sense to allow for duplicate "name" pack items, we should just use a dict. This also makes sharing __context__ between all the plugins *significantly* cleaner
2015-02-07 11:58:50 -08:00
Thomas Jackson
f47df434e3
Inject globals after verifying the function-- because it might not exist!
...
Conflicts:
salt/client/mixins.py
2015-02-07 11:58:46 -08:00
Thomas Jackson
a55c155de4
Attempt dict access
...
Apparently SSH FunctionWraper breaks when you do just the "in" comparator
2015-02-07 11:57:45 -08:00
Thomas Jackson
d1b57764e6
Conditionally inject context (if no one else has)
2015-02-07 11:57:45 -08:00
Thomas Jackson
795fa12415
Remove test as well
...
Conflicts:
tests/unit/output/grains.py
Conflicts:
tests/unit/output/grains.py
2015-02-07 11:57:40 -08:00
Thomas Jackson
e1f8ea650f
Remove grains outputter
...
Its been broken for ~8 months (or more), and its been falling back to nested. Since nested does (IMO) a better job displaying the data and is generic, there is no reason to get this working-- esp since we've already "deprecated" it, by it not working
Conflicts:
salt/output/grains.py
Conflicts:
salt/output/grains.py
2015-02-07 11:57:14 -08:00
Thomas Jackson
df4dfc6635
Rename NewLazyLoader to LazyLoader (since the old one was deleted)
2015-02-07 11:55:27 -08:00
Thomas Jackson
55aa213bca
Some more cleanup to grains outputter, closer to working
...
Conflicts:
salt/output/grains.py
2015-02-07 11:55:23 -08:00
Thomas Jackson
7ee3e592af
__salt__ is not a lazydict object, not a dict.
...
In addition, since _yaml_result_unicode_to_utf8 is recursive, there is no need for the depth under the OrderedDict section
2015-02-07 11:54:49 -08:00
Thomas Jackson
f693ba31ab
Rename func, since it overlaps (works because of ordering, but still...)
2015-02-07 11:54:49 -08:00
Thomas Jackson
109ba59165
Pylint
2015-02-07 11:54:44 -08:00
Thomas Jackson
2fa3df97d1
Proper precedence of file extensions
2015-02-07 11:54:44 -08:00
Thomas Jackson
ff18bd2ea9
Make the pyobjects loader ignore virtual (it did before)
2015-02-07 11:54:44 -08:00
Thomas Jackson
1462df65ab
Migrate to new loader
2015-02-07 11:54:44 -08:00
Thomas Jackson
c6f6148810
Change default to false, since everyone seems to pass them in
2015-02-07 11:54:44 -08:00
Thomas Jackson
e25b0e533a
Make LazyLoader's singleton-ness optional
2015-02-07 11:54:44 -08:00
Thomas Jackson
decd831458
Fix pyobjects renderer to use new loader
2015-02-07 11:54:44 -08:00
Thomas Jackson
1ac61e27af
Fix namespacing of modules in dependency dict
2015-02-07 11:54:43 -08:00
Thomas Jackson
34f0f3b8c3
pylint some more
2015-02-07 11:54:43 -08:00
Thomas Jackson
3a499ea778
Pylint fix
2015-02-07 11:54:43 -08:00
Thomas Jackson
b5d2584ce6
Stop caching grains globally in memory.
...
We can add this later, but we have to determine what conditions go into unique-ing the grains (just mimic disk cache)
2015-02-07 11:54:43 -08:00
Thomas Jackson
9d31b1bcc3
Misc other loader globals fixes
2015-02-07 11:54:43 -08:00
Thomas Jackson
02e219e452
Pack modules to runners
2015-02-07 11:54:39 -08:00
Thomas Jackson
98d361d48c
Fix import namespacing
2015-02-07 11:54:38 -08:00
Thomas Jackson
d1215fdc64
Fix call() in loader
2015-02-07 11:54:38 -08:00
Thomas Jackson
a1cfe7e4e2
More pylint fixes
2015-02-07 11:54:38 -08:00
Thomas Jackson
fe915e7d30
whitespace pylint cleanup
2015-02-07 11:54:38 -08:00
Thomas Jackson
ab22997431
Reload submodules after initial load
2015-02-07 11:54:35 -08:00
Thomas Jackson
73cd9434d0
Pass in "kind" to cleanup in depends decorator instead of guessing
...
Conflicts:
salt/utils/decorators/__init__.py
2015-02-07 11:54:30 -08:00
Thomas Jackson
f160f5e104
Support proxy modules, and misc pylint fixup
2015-02-07 11:53:54 -08:00
Thomas Jackson
7ad65233b9
Add support for non-virtual loader dicts and remove old loader class
...
Conflicts:
salt/loader.py
2015-02-07 11:53:46 -08:00
Thomas Jackson
054daa8c48
Remove majority of *old* loader code
...
Conflicts:
salt/loader.py
2015-02-07 11:53:24 -08:00
Thomas Jackson
7cb1f3c996
Move to clear() for new loader
2015-02-07 11:52:46 -08:00
Thomas Jackson
f9e48c86f3
Use clear() to reload
2015-02-07 11:52:46 -08:00
Thomas Jackson
627c808514
Fix type error
2015-02-07 11:52:42 -08:00
Thomas Jackson
093e3a2351
Add depends support to new lazyloader
2015-02-07 11:52:40 -08:00
Thomas Jackson
fc6dea0657
Add support for multiple types of functions by namespacing out the dep dict
...
Conflicts:
salt/utils/decorators/__init__.py
2015-02-07 11:52:35 -08:00
Thomas Jackson
d8bbce29d3
Catch case where 'return' not in opts, or other ways to get an empty returner (as it will just fail anyways)
2015-02-07 11:51:36 -08:00
Thomas Jackson
6fc29454d1
pylint
2015-02-07 11:51:36 -08:00
Thomas Jackson
260feaf764
Re-add pyx support
2015-02-07 11:51:36 -08:00
Thomas Jackson
f2688a6deb
Handle disk better
...
Since we are now loading the "squashfs" into memory, we need to handle the inevitable case where the disk content changes. This will re-load from disk up to once per get when a file is missing or we loaded everything else.
2015-02-07 11:51:36 -08:00
Thomas Jackson
e71f7b55e5
Fix grains caching
2015-02-07 11:51:32 -08:00
Thomas Jackson
b0e1425fc8
Migrate everything over to NewLazyLoader
...
Conflicts:
salt/loader.py
2015-02-07 11:51:25 -08:00
Thomas Jackson
e26ff89956
Some major hacking of the loader, don't really like it... but i guess i'll keep it around for a while
...
Conflicts:
salt/loader.py
2015-02-07 11:50:57 -08:00
Seth House
9a1a2db3aa
Merge remote-tracking branch 'upstream/2014.7' into 2015.2
2015-02-06 19:52:23 -07:00
Pedro Algarvio
5586c2064b
Merge pull request #20487 from whiteinge/doc-remove-mako-mock
...
Remove Mako from mocked deps for docs build
2015-02-07 02:28:53 +00:00
Seth House
bf6dfe823e
Remove Mako from mocked deps for docs build
...
If Mako was mocked for a reason originally, it doesn't seem to be needed
anymore. The docs build just fine with and without Mako installed.
Closes #9571 (at long last).
2015-02-06 19:00:35 -07:00
