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
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
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
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
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
cc6627cdd6
Remove custom json encoder cleaner and strip proxy var stuff out before encoding
...
Fixes #12349
2015-09-17 16:04:47 -04:00
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
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
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
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
b8b206005c
Generalize extra variable parsing and loading
...
Fixes #11352
2015-07-21 00:18:35 -04:00
ce3ef7f4c1
Making the switch to v2
2015-05-03 21:47:26 -05:00
Dag Wieers
Brian Coca
Toshio Kuratomi
James Cammarata
Marius Gedminas