openstack/python-cinderclient
Code Issues Proposed changes

Merge "Keep py3.X compatibility for urllib"

Browse Source
This commit is contained in:
Jenkins 2016-03-17 17:30:43 +00:00 committed by Gerrit Code Review
commit 635b14b058
3 changed files with 3 additions and 12 deletions
cinderclient
client.py
tests/unit
v1
fakes.py
v2
fakes.py

5
cinderclient/client.py

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

5
cinderclient/tests/unit/v1/fakes.py

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

5
cinderclient/tests/unit/v2/fakes.py

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