Merge "Keep py3.X compatibility for urllib"
This commit is contained in:
commit
835ff6bd99
@ -30,10 +30,7 @@ from troveclient import exceptions
|
||||
from troveclient.openstack.common.apiclient import client
|
||||
from troveclient import service_catalog
|
||||
|
||||
try:
|
||||
import urlparse
|
||||
except ImportError:
|
||||
import urllib.parse as urlparse
|
||||
import six.moves.urllib.parse as urlparse
|
||||
|
||||
try:
|
||||
import eventlet as sleep_lib
|
||||
|
Loading…
Reference in New Issue
Block a user