Use six.moves.urllib.parse instead of urlparse

To keep Python 3.x compatibility, use six.moves.urllib.parse to
replace urlparse. tools/lintstack is changed to pass pylint test.

Partial-Bug: #1279611

Change-Id: I0ceaaccbf6c67b45609b4f2f5639c362b32d10ad

diff --git a/cinder/api/common.py b/cinder/api/common.py
index 9ad0847f63e716a5d2802fde3da76b92c0926c45..52802295b25ebee2f14a6e40a3be4b80f8fedce5 100644 (file)
--- a/cinder/api/common.py
+++ b/cinder/api/common.py
@@ -16,9 +16,9 @@
 
 import os
 import re
-import urlparse
 
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 
 from cinder.api.openstack import wsgi

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index aca124387f988711367700f589e10d5f6179469c..8fe60a7c38f18a2f420439ef6f1451367f0aad5d 100644 (file)
--- a/cinder/image/glance.py
+++ b/cinder/image/glance.py
@@ -25,10 +25,10 @@ import random
 import shutil
 import sys
 import time
-import urlparse
 
 import glanceclient.exc
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 
 from cinder import exception
 from cinder.openstack.common import jsonutils

diff --git a/cinder/tests/integrated/api/client.py b/cinder/tests/integrated/api/client.py
index 84e878e4964d4b17e3cc461c39c8a2e4bdca714b..b6787c06eb2770d6a67ea1f5c08dd55505ce6a3c 100644 (file)
--- a/cinder/tests/integrated/api/client.py
+++ b/cinder/tests/integrated/api/client.py
@@ -14,7 +14,8 @@
 
 import netaddr
 import requests
-import urlparse
+
+import six.moves.urllib.parse as urlparse
 
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging

diff --git a/cinder/tests/test_migrations.py b/cinder/tests/test_migrations.py
index e930ee98ca48e67af559799cc938fade0aa0234d..bba727a17f6379d8d6fd00b27b1e51b4fed4aea7 100644 (file)
--- a/cinder/tests/test_migrations.py
+++ b/cinder/tests/test_migrations.py
@@ -26,10 +26,10 @@ if possible.
 import ConfigParser
 import os
 import subprocess
-import urlparse
 import uuid
 
 from migrate.versioning import repository
+import six.moves.urllib.parse as urlparse
 import sqlalchemy
 import testtools
 

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index be162f9456a35d5a896e90c1781a020a574b8ed2..2aafbb6ffc2c38ea17521d02455b8237167a45b8 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/cinder/volume/drivers/coraid.py
@@ -25,9 +25,9 @@ import cookielib
 import math
 import urllib
 import urllib2
-import urlparse
 
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 
 from cinder import exception
 from cinder.openstack.common import jsonutils

diff --git a/cinder/volume/drivers/netapp/eseries/client.py b/cinder/volume/drivers/netapp/eseries/client.py
index 8f4178069b2cd28192f5eb1f9cabfae7ff1d13c7..d92af339ff26df2a3f391a470e44463a06006b3d 100644 (file)
--- a/cinder/volume/drivers/netapp/eseries/client.py
+++ b/cinder/volume/drivers/netapp/eseries/client.py
@@ -18,7 +18,8 @@ Client classes for web services.
 
 import json
 import requests
-import urlparse
+
+import six.moves.urllib.parse as urlparse
 
 from cinder import exception
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/drivers/netapp/nfs.py b/cinder/volume/drivers/netapp/nfs.py
index f0601ae0a4707e7ea00901cd4f6f7dc8f3ce0531..1e5fa3fe10284e95f7e52dce79db72412b15aa13 100644 (file)
--- a/cinder/volume/drivers/netapp/nfs.py
+++ b/cinder/volume/drivers/netapp/nfs.py
@@ -21,9 +21,10 @@ import os
 import re
 from threading import Timer
 import time
-import urlparse
 import uuid
 
+import six.moves.urllib.parse as urlparse
+
 from cinder import exception
 from cinder.image import image_utils
 from cinder.openstack.common import excutils

diff --git a/cinder/volume/drivers/nexenta/utils.py b/cinder/volume/drivers/nexenta/utils.py
index fc032ec1f11f61617475f704813466f5c40c0aff..42ebe1bee0734093557ad50b50aeb96b1672519c 100644 (file)
--- a/cinder/volume/drivers/nexenta/utils.py
+++ b/cinder/volume/drivers/nexenta/utils.py
@@ -22,7 +22,8 @@
 """
 
 import re
-import urlparse
+
+import six.moves.urllib.parse as urlparse
 
 from cinder import units
 

diff --git a/cinder/volume/drivers/scality.py b/cinder/volume/drivers/scality.py
index 559bfabd4654c83bcc2eacd6e0d55f9d79d3e7e0..4343654f72cc624a3f6211b0b4577c962a4e13cf 100644 (file)
--- a/cinder/volume/drivers/scality.py
+++ b/cinder/volume/drivers/scality.py
@@ -20,9 +20,9 @@ Scality SOFS Volume Driver.
 import errno
 import os
 import urllib2
-import urlparse
 
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 
 from cinder import exception
 from cinder.image import image_utils

diff --git a/cinder/volume/drivers/vmware/read_write_util.py b/cinder/volume/drivers/vmware/read_write_util.py
index 37263c0ddd0f0e0b2614096d4bf5f4da5035b593..f8bb87f4121c6cb483700379712ba2ae1af67501 100644 (file)
--- a/cinder/volume/drivers/vmware/read_write_util.py
+++ b/cinder/volume/drivers/vmware/read_write_util.py
@@ -23,7 +23,8 @@ import httplib
 import netaddr
 import urllib
 import urllib2
-import urlparse
+
+import six.moves.urllib.parse as urlparse
 
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.vmware import error_util

diff --git a/tools/lintstack.py b/tools/lintstack.py
index b4d252c9dcc07e962edbfec72213460cff629dfc..1a79ef3b4e2a6aee40a853305fcb2356bae606c3 100755 (executable)
--- a/tools/lintstack.py
+++ b/tools/lintstack.py
@@ -30,7 +30,9 @@ from six.moves import cStringIO as StringIO
 ignore_codes = ["E1103"]
 # Note(maoy): the error message is the pattern of E0202. It should be ignored
 # for cinder.tests modules
-ignore_messages = ["An attribute affected in cinder.tests"]
+#Note(fengqian): the second error message is the pattern of [E0611].
+#It should be ignored because use six module to keep py3.X compatibility.
+ignore_messages = ["An attribute affected in cinder.tests", "No name 'urllib' in module '_MovedItems'"]
 # Note(maoy): we ignore all errors in openstack.common because it should be
 # checked elsewhere. We also ignore cinder.tests for now due to high false
 # positive rate.