Merge "Keep py3.X compatibility for urllib"

This commit is contained in:
Jenkins 2016-04-05 15:46:17 +00:00 committed by Gerrit Code Review
commit 835ff6bd99

View File

@ -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