cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix import of urlparse on python3

Browse source 
Should fix the error reported here:
https://github.com/ansible/ansible/issues/17495#issuecomment-267921719

(cherry picked from commit 4f960a4f42)
This commit is contained in:
Toshio Kuratomi 2017-01-30 09:03:04 -08:00
parent 04b2e1fbc0
commit 5f5d143194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/docker_common.py
View file

@ -21,10 +21,10 @@ import re
import json import json
import sys import sys
import copy import copy
from distutils.version import LooseVersion 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_PY = True
HAS_DOCKER_ERROR = None HAS_DOCKER_ERROR = None