starlingx
/
gui
Code Issues Proposed changes

Merge "Fix the conflict of urlparse between python2 and python3"

This commit is contained in:
Zuul 2018-10-25 13:14:38 +00:00 committed by Gerrit Code Review
parent 1c57e8b717 0f01a337c7
commit 7f34d9cbca
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/patch.py
View File

@ -14,7 +14,10 @@
#
import logging
import urlparse
try:
from urlparse import urlparse
except ModuleNotFoundError:
from urllib.parse import urlparse
import requests
@ -93,7 +96,7 @@ class Client(object):
def _patching_client(request):
o = urlparse.urlparse(base.url_for(request, 'patching'))
o = urlparse(base.url_for(request, 'patching'))
url = "://".join((o.scheme, o.netloc))
return Client("v1", url, token_id=request.user.token.id)

7
starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/vim.py
View File

@ -14,7 +14,10 @@
#
import logging
import urlparse
try:
from urlparse import urlparse
except ModuleNotFoundError:
from urllib.parse import urlparse
from openstack_dashboard.api import base
@ -59,7 +62,7 @@ class Client(object):
def _sw_update_client(request):
o = urlparse.urlparse(base.url_for(request, 'nfv'))
o = urlparse(base.url_for(request, 'nfv'))
url = "://".join((o.scheme, o.netloc))
return Client(url, token_id=request.user.token.id)