James Cammarata
8cc98b07c5
Fixing PEP8 errors in utils/vars.py
2017-02-13 16:13:40 -06:00
James Cammarata
a4b2b0a734
Small fix for 350a32bd to make it Py3 compliant
2017-02-13 15:54:25 -06:00
James Cammarata
350a32bd95
Tweaking the new unique id generate to be uuid compliant
2017-02-13 13:34:53 -06:00
James Cammarata
f82a2caa72
Forgot to include the utils/vars.py change with 4cbe610
2017-02-10 14:54:53 -06:00
Toshio Kuratomi
4ed88512e4
Move uses of to_bytes, to_text, to_native to use the module_utils version ( #17423 )
...
We couldn't copy to_unicode, to_bytes, to_str into module_utils because
of licensing. So once created it we had two sets of functions that did
the same things but had different implementations. To remedy that, this
change removes the ansible.utils.unicode versions of those functions.
2016-09-06 22:54:17 -07:00
Strahinja Kustudić
eed6cf5dad
Adds 'ansible_check_mode' boolean magic variable
...
* Makes it possible to pass any options variable to VariableManager
by changing `load_options_vars(options)` in `lib/ansible/utils/vars.py`
2016-04-08 00:26:02 +02:00
Dag Wieers
0eca47cf91
Avoid merging a dict and a AnsibleUnicode
...
This is the same fix we applied to v1.9 in PR #14565 , however it does not fix #14678 completely !
The dictionaries are not being merged as tey are on v1.9.
2016-02-26 15:03:51 +01:00
Dag Wieers
5a57139d91
Improve efficiency of merge_hash
...
This is related to #14559 , but only the part for Ansible v2.0
This commit makes merging empty dicts, or equal dicts more efficient.
I noticed that while debugging merge_hash a lot of merges related to empty dictionaries and sometimes also identical dictionaries.
2016-02-18 16:03:11 +01:00
Brian Coca
27f4730c29
correctly deals with non serializable type
...
combine_vars shoudl really be data types, but some just get in
in test, add dict to mock and avoid combine_vars using object
2016-01-18 15:17:43 -05:00
Brian Coca
9d1b280689
now combine vars errors dump vars
...
very hard to debug w/o knowing what vars were being merged at the time of the error
2016-01-14 10:23:35 -05:00
Toshio Kuratomi
baa309309d
Bundle a new version of python-six for compatibility along with some code to make it easy for distributions to override the bunndled copy if they have a new enough version.
2015-10-16 08:21:28 -07:00
James Cammarata
cc6627cdd6
Remove custom json encoder cleaner and strip proxy var stuff out before encoding
...
Fixes #12349
2015-09-17 16:04:47 -04:00
James Cammarata
30399edada
Use UnsafeProxy for lookup results too
...
Also fixes a couple of bugs that popped up when using the proxy class
2015-09-08 12:19:39 -04:00
Toshio Kuratomi
aeff960d02
Cleanup combine_vars
...
* Dedupe combine_vars() code (removed from VariableManager)
* Fix merge_hash algorithm to preserve the type
* unittest combine_vars and merge_hash
2015-09-01 11:23:12 -07:00
Marius Gedminas
54dbfba8f8
Make combine_vars() compatible with Python 3
...
Fixes
TypeError: unsupported operand type(s) for +: 'dict_items' and 'dict_items'
on Python 3.
2015-09-01 09:39:59 +03:00
James Cammarata
5a5b9f211b
Validate variable names when loading 'vars:' blocks
...
TODO: add this to VariableManager to validate vars loaded from files too
Fixes #12022
2015-08-28 11:36:31 -04:00
James Cammarata
b8b206005c
Generalize extra variable parsing and loading
...
Fixes #11352
2015-07-21 00:18:35 -04:00
James Cammarata
ce3ef7f4c1
Making the switch to v2
2015-05-03 21:47:26 -05:00
