Merge "Fix the conflict of urlparse between python2 and python3"
This commit is contained in:
commit
7f34d9cbca
|
@ -14,7 +14,10 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import urlparse
|
try:
|
||||||
|
from urlparse import urlparse
|
||||||
|
except ModuleNotFoundError:
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
|
@ -93,7 +96,7 @@ class Client(object):
|
||||||
|
|
||||||
|
|
||||||
def _patching_client(request):
|
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))
|
url = "://".join((o.scheme, o.netloc))
|
||||||
return Client("v1", url, token_id=request.user.token.id)
|
return Client("v1", url, token_id=request.user.token.id)
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,10 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
import urlparse
|
try:
|
||||||
|
from urlparse import urlparse
|
||||||
|
except ModuleNotFoundError:
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
from openstack_dashboard.api import base
|
from openstack_dashboard.api import base
|
||||||
|
|
||||||
|
@ -59,7 +62,7 @@ class Client(object):
|
||||||
|
|
||||||
|
|
||||||
def _sw_update_client(request):
|
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))
|
url = "://".join((o.scheme, o.netloc))
|
||||||
return Client(url, token_id=request.user.token.id)
|
return Client(url, token_id=request.user.token.id)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue