From 0b3fbf88dd41eb73cde45819e55797e39c335266 Mon Sep 17 00:00:00 2001 From: Fengqian Gao Date: Wed, 12 Feb 2014 14:01:10 +0800 Subject: [PATCH] Use six.moves.urllib.parse instead of urlparse To keep Python 3.x compatibility, use six.moves.urllib.parse to replace urlparse. Partial-Bug: #1279611 Change-Id: Ibe5e028acd12e8d753d95cfd9c3f63072278b120 --- glance/api/v1/images.py | 2 +- glance/common/auth.py | 4 ++-- glance/common/client.py | 3 ++- glance/common/exception.py | 2 +- glance/common/location_strategy/store_type.py | 3 +-- .../migrate_repo/versions/015_quote_swift_credentials.py | 2 +- .../versions/017_quote_encrypted_swift_credentials.py | 2 +- glance/store/filesystem.py | 2 +- glance/store/gridfs.py | 2 +- glance/store/http.py | 3 ++- glance/store/location.py | 2 +- glance/store/s3.py | 2 +- glance/store/swift.py | 2 +- glance/store/vmware_datastore.py | 2 +- glance/tests/functional/__init__.py | 2 +- glance/tests/functional/store/test_s3.py | 2 +- glance/tests/functional/store/test_swift.py | 2 +- glance/tests/unit/test_migrations.py | 2 +- 18 files changed, 21 insertions(+), 20 deletions(-) diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py index d54aab9ca0..4a89ec7fca 100644 --- a/glance/api/v1/images.py +++ b/glance/api/v1/images.py @@ -18,10 +18,10 @@ """ import copy -import urlparse import eventlet from oslo.config import cfg +import six.moves.urllib.parse as urlparse from webob.exc import (HTTPNotFound, HTTPConflict, HTTPBadRequest, diff --git a/glance/common/auth.py b/glance/common/auth.py index ce4baef7e1..cca4938dff 100644 --- a/glance/common/auth.py +++ b/glance/common/auth.py @@ -28,10 +28,10 @@ Keystone (an identity management system). > auth_plugin.management_url http://service_endpoint/ """ -import urlparse - import httplib2 +import six.moves.urllib.parse as urlparse + from glance.common import exception from glance.openstack.common import jsonutils import glance.openstack.common.log as logging diff --git a/glance/common/client.py b/glance/common/client.py index 3dc04f62b6..488cdc7638 100644 --- a/glance/common/client.py +++ b/glance/common/client.py @@ -25,7 +25,6 @@ import httplib import os import re import urllib -import urlparse try: from eventlet.green import socket, ssl @@ -38,6 +37,8 @@ try: SENDFILE_SUPPORTED = True except ImportError: SENDFILE_SUPPORTED = False + +import six.moves.urllib.parse as urlparse from six.moves import xrange from glance.common import auth diff --git a/glance/common/exception.py b/glance/common/exception.py index 31cb7fbe49..5fd535d0cf 100644 --- a/glance/common/exception.py +++ b/glance/common/exception.py @@ -16,7 +16,7 @@ """Glance exception subclasses""" -import urlparse +import six.moves.urllib.parse as urlparse _FATAL_EXCEPTION_FORMAT_ERRORS = False diff --git a/glance/common/location_strategy/store_type.py b/glance/common/location_strategy/store_type.py index 5ae87fb25b..aededb5484 100644 --- a/glance/common/location_strategy/store_type.py +++ b/glance/common/location_strategy/store_type.py @@ -15,10 +15,9 @@ """Storage preference based location strategy module""" -import urlparse - from oslo.config import cfg import six +import six.moves.urllib.parse as urlparse store_type_opts = [ cfg.ListOpt("store_type_preference", diff --git a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py index df0e13589b..d617361fa1 100644 --- a/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py +++ b/glance/db/sqlalchemy/migrate_repo/versions/015_quote_swift_credentials.py @@ -14,8 +14,8 @@ # under the License. import urllib -import urlparse +import six.moves.urllib.parse as urlparse import sqlalchemy from glance.common import exception diff --git a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py index f49a68c559..0406ce9250 100644 --- a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py +++ b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py @@ -28,9 +28,9 @@ Fixes bug #1081043 """ import types # noqa import urllib -import urlparse from oslo.config import cfg +import six.moves.urllib.parse as urlparse import sqlalchemy from glance.common import crypt diff --git a/glance/store/filesystem.py b/glance/store/filesystem.py index 6e0ecf3d86..75812eed3e 100644 --- a/glance/store/filesystem.py +++ b/glance/store/filesystem.py @@ -20,9 +20,9 @@ A simple filesystem-backed store import errno import hashlib import os -import urlparse from oslo.config import cfg +import six.moves.urllib.parse as urlparse from glance.common import exception from glance.common import utils diff --git a/glance/store/gridfs.py b/glance/store/gridfs.py index 3cfddf54b3..3617825077 100644 --- a/glance/store/gridfs.py +++ b/glance/store/gridfs.py @@ -17,7 +17,7 @@ from __future__ import absolute_import from oslo.config import cfg -import urlparse +import six.moves.urllib.parse as urlparse from glance.common import exception from glance.openstack.common import excutils diff --git a/glance/store/http.py b/glance/store/http.py index 4df03adf10..dc748bebb9 100644 --- a/glance/store/http.py +++ b/glance/store/http.py @@ -14,7 +14,8 @@ # under the License. import httplib -import urlparse + +import six.moves.urllib.parse as urlparse from glance.common import exception import glance.openstack.common.log as logging diff --git a/glance/store/location.py b/glance/store/location.py index 1472e0eac7..e6fe7920a1 100644 --- a/glance/store/location.py +++ b/glance/store/location.py @@ -37,7 +37,7 @@ that it stores in its storage backends. It **may contain** security credentials and is **not** user-facing. """ -import urlparse +import six.moves.urllib.parse as urlparse from glance.common import exception import glance.openstack.common.log as logging diff --git a/glance/store/s3.py b/glance/store/s3.py index 59ee030618..d9e1b4896d 100644 --- a/glance/store/s3.py +++ b/glance/store/s3.py @@ -19,9 +19,9 @@ import hashlib import httplib import re import tempfile -import urlparse from oslo.config import cfg +import six.moves.urllib.parse as urlparse from glance.common import exception from glance.common import utils diff --git a/glance/store/swift.py b/glance/store/swift.py index ded5a45ba4..48c26bab32 100644 --- a/glance/store/swift.py +++ b/glance/store/swift.py @@ -21,9 +21,9 @@ import hashlib import httplib import math import urllib -import urlparse from oslo.config import cfg +import six.moves.urllib.parse as urlparse from glance.common import auth from glance.common import exception diff --git a/glance/store/vmware_datastore.py b/glance/store/vmware_datastore.py index a56593d825..5ebf257415 100644 --- a/glance/store/vmware_datastore.py +++ b/glance/store/vmware_datastore.py @@ -18,10 +18,10 @@ import hashlib import httplib import urllib -import urlparse import netaddr from oslo.config import cfg +import six.moves.urllib.parse as urlparse from glance.common import exception import glance.openstack.common.log as logging diff --git a/glance/tests/functional/__init__.py b/glance/tests/functional/__init__.py index d43e3d9ac5..d3016d3db1 100644 --- a/glance/tests/functional/__init__.py +++ b/glance/tests/functional/__init__.py @@ -32,9 +32,9 @@ import socket import sys import tempfile import time -import urlparse import fixtures +import six.moves.urllib.parse as urlparse from sqlalchemy import create_engine import testtools diff --git a/glance/tests/functional/store/test_s3.py b/glance/tests/functional/store/test_s3.py index ae7304254a..1fcfee4995 100644 --- a/glance/tests/functional/store/test_s3.py +++ b/glance/tests/functional/store/test_s3.py @@ -24,9 +24,9 @@ import ConfigParser import os import os.path import urllib -import urlparse import oslo.config.cfg +import six.moves.urllib.parse as urlparse import testtools import glance.store.s3 diff --git a/glance/tests/functional/store/test_swift.py b/glance/tests/functional/store/test_swift.py index 4a2d11b4ff..b5dc85263d 100644 --- a/glance/tests/functional/store/test_swift.py +++ b/glance/tests/functional/store/test_swift.py @@ -28,10 +28,10 @@ import random import string import StringIO import urllib -import urlparse import uuid import oslo.config.cfg +import six.moves.urllib.parse as urlparse import testtools from glance.common import exception diff --git a/glance/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py index 020e5dbe5b..9a48bfc55c 100644 --- a/glance/tests/unit/test_migrations.py +++ b/glance/tests/unit/test_migrations.py @@ -30,12 +30,12 @@ import datetime import os import pickle import subprocess -import urlparse import uuid from migrate.versioning import api as migration_api from migrate.versioning.repository import Repository from oslo.config import cfg +import six.moves.urllib.parse as urlparse from six.moves import xrange import sqlalchemy