3 commits

Author	SHA1	Message	Date
Brian Coca	cbb6a7f4e8	Enabled unsafe and vault in JSON (#38759) ... * allow to load json marked as unsafe or vault * centralized json code/decode, add vault support * use generics to allow for more varied inputs * allow inventory to dump vault w/o decrypting * override simplejson also * add entry for unsafe also * load vaulted and unsafe json, support unvaulting if secrets provided	2018-05-09 14:01:51 -04:00
Toshio Kuratomi	225fa5d092	Fix undefined variables, basestring usage, and some associated python3 issues	2017-07-25 15:58:23 -07:00
Toshio Kuratomi	1c05ed7951	Fix circular import with unsafe_proxy, template, and vars ... template/__init__.py imported unsafe_proxy from vars which caused vars/__init__.py to load. vars/__init__.py needed template/__init__.py which caused issues. Loading unsafe_proxy from another location fixes that.	2017-04-28 15:35:30 -07:00