diff options
author | Toshio Kuratomi <a.badger@gmail.com> | 2017-03-23 13:35:05 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-23 13:35:05 -0700 |
commit | 2fff690caab6a1c6a81973f704be3fbd0bde2c2f (patch) | |
tree | d30539214f54f7073ca75c11e8077b0c21aff82f /lib/ansible/galaxy | |
parent | c7c8481181e96dab508e11917551551f83c5b677 (diff) | |
download | ansible-2fff690caab6a1c6a81973f704be3fbd0bde2c2f.tar.gz |
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 'lib/ansible/galaxy')
-rw-r--r-- | lib/ansible/galaxy/__init__.py | 3 | ||||
-rw-r--r-- | lib/ansible/galaxy/api.py | 6 | ||||
-rw-r--r-- | lib/ansible/galaxy/login.py | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/lib/ansible/galaxy/__init__.py b/lib/ansible/galaxy/__init__.py index 129e860c90..f221a85cce 100644 --- a/lib/ansible/galaxy/__init__.py +++ b/lib/ansible/galaxy/__init__.py @@ -25,9 +25,8 @@ __metaclass__ = type import os -from ansible.compat.six import string_types - from ansible.errors import AnsibleError +from ansible.module_utils.six import string_types # default_readme_template # default_meta_template diff --git a/lib/ansible/galaxy/api.py b/lib/ansible/galaxy/api.py index 068a888e41..08befce0cd 100644 --- a/lib/ansible/galaxy/api.py +++ b/lib/ansible/galaxy/api.py @@ -25,11 +25,11 @@ __metaclass__ = type import json import ansible.constants as C -from ansible.compat.six import string_types -from ansible.compat.six.moves.urllib.error import HTTPError -from ansible.compat.six.moves.urllib.parse import quote as urlquote, urlencode from ansible.errors import AnsibleError from ansible.galaxy.token import GalaxyToken +from ansible.module_utils.six import string_types +from ansible.module_utils.six.moves.urllib.error import HTTPError +from ansible.module_utils.six.moves.urllib.parse import quote as urlquote, urlencode from ansible.module_utils._text import to_native, to_text from ansible.module_utils.urls import open_url diff --git a/lib/ansible/galaxy/login.py b/lib/ansible/galaxy/login.py index 4e1b194e65..affe3c82f0 100644 --- a/lib/ansible/galaxy/login.py +++ b/lib/ansible/galaxy/login.py @@ -25,10 +25,9 @@ __metaclass__ = type import getpass import json -from ansible.compat.six.moves.urllib.parse import quote as urlquote, urlparse -from ansible.compat.six.moves.urllib.error import HTTPError - from ansible.errors import AnsibleError, AnsibleOptionsError +from ansible.module_utils.six.moves.urllib.parse import quote as urlquote, urlparse +from ansible.module_utils.six.moves.urllib.error import HTTPError from ansible.module_utils.urls import open_url from ansible.utils.color import stringc @@ -38,6 +37,7 @@ except ImportError: from ansible.utils.display import Display display = Display() + class GalaxyLogin(object): ''' Class to handle authenticating user with Galaxy API prior to performing CUD operations ''' |