From d4aaafbd9f280ab40961415fd111d4212bf67263 Mon Sep 17 00:00:00 2001 From: LiuNanke Date: Thu, 14 Jan 2016 02:22:53 +0800 Subject: [PATCH] Keep py3.X compatibility for urllib Use six.moves.urllib.parse instead of urllib. For urllib2 compatibility, it need to sync policy module from oslo first. Then six.moves.urllib.request can replace urllib2. Change-Id: Ia351cd3088dd64fd8c8ce4ca8b9a5889c574888e Partial-Bug: #1280105 --- cinderclient/client.py | 5 +---- cinderclient/tests/unit/v1/fakes.py | 5 +---- cinderclient/tests/unit/v2/fakes.py | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/cinderclient/client.py b/cinderclient/client.py index 27171528a..146776ef0 100644 --- a/cinderclient/client.py +++ b/cinderclient/client.py @@ -43,10 +43,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 diff --git a/cinderclient/tests/unit/v1/fakes.py b/cinderclient/tests/unit/v1/fakes.py index 35043d2c1..e7659ecb8 100644 --- a/cinderclient/tests/unit/v1/fakes.py +++ b/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 diff --git a/cinderclient/tests/unit/v2/fakes.py b/cinderclient/tests/unit/v2/fakes.py index b787e2da6..f6c58ed32 100644 --- a/cinderclient/tests/unit/v2/fakes.py +++ b/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