diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2017-01-30 09:03:04 -0800 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2017-01-30 09:44:04 -0800 |
| commit | 5f5d1431948c3b093449c0deaf59bf7e064e51b7 (patch) | |
| tree | bc9449f0306f5ec83a1d8785d642eff4438ecf22 | |
| parent | 04b2e1fbc07dbb96a03739a847a9f8f03e8789ef (diff) | |
| download | ansible-5f5d1431948c3b093449c0deaf59bf7e064e51b7.tar.gz | |
Fix import of urlparse on python3
Should fix the error reported here:
https://github.com/ansible/ansible/issues/17495#issuecomment-267921719
(cherry picked from commit 4f960a4f42de718ecdb267903c80b28134d551a1)
| -rw-r--r-- | lib/ansible/module_utils/docker_common.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/module_utils/docker_common.py b/lib/ansible/module_utils/docker_common.py index f36110a39d..4976b93ab1 100644 --- a/lib/ansible/module_utils/docker_common.py +++ b/lib/ansible/module_utils/docker_common.py @@ -21,10 +21,10 @@ import re import json import sys import copy - from distutils.version import LooseVersion -from urlparse import urlparse -from ansible.module_utils.basic import * + +from ansible.module_utils.basic import AnsibleModule, BOOLEANS_TRUE, BOOLEANS_FALSE +from ansible.module_utils.six.moves.urllib.parse import urlparse HAS_DOCKER_PY = True HAS_DOCKER_ERROR = None |