From 5f5d1431948c3b093449c0deaf59bf7e064e51b7 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mon, 30 Jan 2017 09:03:04 -0800 Subject: [PATCH] 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) --- lib/ansible/module_utils/docker_common.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/module_utils/docker_common.py b/lib/ansible/module_utils/docker_common.py index f36110a39d8..4976b93ab13 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