External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3416 from Spredzy/urllib_parse

Browse Source 
plugins/tower.py: Use urllib.parse rather than urlparse

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-03-18 13:16:29 +00:00
committed by GitHub
parent 8f1c20423b 3a4f56bb2b
commit 9ab7752d32
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/plugins/inventory/tower.py
View File

@@ -34,7 +34,11 @@ import sys
import json import json
import requests import requests
from requests.auth import HTTPBasicAuth from requests.auth import HTTPBasicAuth
from urlparse import urljoin
try:
from urlparse import urljoin
except ImportError:
from urllib.parse import urljoin
def parse_configuration(): def parse_configuration():