Skip to content

A
ansible
Commit 0243b7be by Daniel Hokka Zakrisson
Options

Fix get_url to work on Python 2.4

parent 03cf5b27
Showing with 6 additions and 4 deletions
library/get_url
...@@ -101,11 +101,13 @@ def url_do_get(module, url, dest): ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment