diff options
author | Toshio Kuratomi <a.badger@gmail.com> | 2017-03-23 21:35:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-23 21:35:05 +0100 |
commit | 2fff690caab6a1c6a81973f704be3fbd0bde2c2f (patch) | |
tree | d30539214f54f7073ca75c11e8077b0c21aff82f /test/units/vars/test_variable_manager.py | |
parent | No need to specialcase comment characters (diff) | |
download | ansible-2fff690caab6a1c6a81973f704be3fbd0bde2c2f.tar.xz ansible-2fff690caab6a1c6a81973f704be3fbd0bde2c2f.zip |
Update module_utils.six to latest (#22855)
* Update module_utils.six to latest
We've been held back on the version of six we could use on the module
side to 1.4.x because of python-2.4 compatibility. Now that our minimum
is Python-2.6, we can update to the latest version of six in
module_utils and get rid of the second copy in lib/ansible/compat.
Diffstat (limited to 'test/units/vars/test_variable_manager.py')
-rw-r--r-- | test/units/vars/test_variable_manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/units/vars/test_variable_manager.py b/test/units/vars/test_variable_manager.py index b2397d6cf2..d2bcde8bb1 100644 --- a/test/units/vars/test_variable_manager.py +++ b/test/units/vars/test_variable_manager.py @@ -21,11 +21,11 @@ __metaclass__ = type from collections import defaultdict -from ansible.compat.six import iteritems -from ansible.compat.six.moves import builtins from ansible.compat.tests import unittest from ansible.compat.tests.mock import MagicMock, mock_open, patch from ansible.inventory import Inventory +from ansible.module_utils.six import iteritems +from ansible.module_utils.six.moves import builtins from ansible.playbook.play import Play from units.mock.loader import DictDataLoader |