wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix get_url to work on Python 2.4

Browse source
This commit is contained in:
Daniel Hokka Zakrisson 2013-01-29 18:57:02 +01:00
parent 03cf5b2777
commit 0243b7be7c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/get_url
View file

@ -101,11 +101,13 @@ def url_do_get(module, url, dest):
info = dict(url=url, dest=dest) info = dict(url=url, dest=dest)
r = None r = None
parsed = urlparse.urlparse(url) parsed = urlparse.urlparse(url)
if '@' in parsed.netloc: if '@' in parsed[1]:
credentials = parsed.netloc.split('@')[0] credentials, netloc = parsed[1].split('@', 1)
if ':' in credentials: if ':' in credentials:
username, password = credentials.split(':') username, password = credentials.split(':', 1)
netloc = parsed.netloc.split('@')[1] else:
username = credentials
password = ''
parsed = list(parsed) parsed = list(parsed)
parsed[1] = netloc parsed[1] = netloc