Merge "Keep py3.X compatibility for urllib"
This commit is contained in:
commit
635b14b058
@ -45,10 +45,7 @@ from oslo_utils import strutils
|
||||
|
||||
osprofiler_web = importutils.try_import("osprofiler.web")
|
||||
|
||||
try:
|
||||
import urlparse
|
||||
except ImportError:
|
||||
import urllib.parse as urlparse
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
try:
|
||||
from eventlet import sleep
|
||||
|
@ -15,10 +15,7 @@
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
try:
|
||||
import urlparse
|
||||
except ImportError:
|
||||
import urllib.parse as urlparse
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from cinderclient import client as base_client
|
||||
from cinderclient.tests.unit import fakes
|
||||
|
@ -14,10 +14,7 @@
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
try:
|
||||
import urlparse
|
||||
except ImportError:
|
||||
import urllib.parse as urlparse
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
from cinderclient import client as base_client
|
||||
from cinderclient.tests.unit import fakes
|
||||
|
Loading…
x
Reference in New Issue
Block a user