From 6113ede1982520d22ae93366c54de41f7ae59b50 Mon Sep 17 00:00:00 2001 From: He Yongli Date: Wed, 12 Feb 2014 16:02:37 +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. Closes-Bug: #1279611 Change-Id: I1867ef3ab0fd13cc7fd0875b419e06c2d96963c2 --- rsdns/client/records.py | 2 +- trove/common/pagination.py | 2 +- trove/common/utils.py | 2 +- trove/openstack/common/network_utils.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rsdns/client/records.py b/rsdns/client/records.py index 2a31740466..b5f4178e90 100644 --- a/rsdns/client/records.py +++ b/rsdns/client/records.py @@ -17,7 +17,7 @@ Records interface. """ -import urlparse +import six.moves.urllib.parse as urlparse from novaclient import base from rsdns.client.future import FutureResource diff --git a/trove/common/pagination.py b/trove/common/pagination.py index 1aac438ca3..3e18305594 100644 --- a/trove/common/pagination.py +++ b/trove/common/pagination.py @@ -16,7 +16,7 @@ # under the License. import urllib -import urlparse +import six.moves.urllib.parse as urlparse def url_quote(s): diff --git a/trove/common/utils.py b/trove/common/utils.py index 3db2a3ba40..90d49cd760 100644 --- a/trove/common/utils.py +++ b/trove/common/utils.py @@ -21,7 +21,7 @@ import inspect import jinja2 import sys import time -import urlparse +import six.moves.urllib.parse as urlparse import uuid import os import shutil diff --git a/trove/openstack/common/network_utils.py b/trove/openstack/common/network_utils.py index dbed1ceb44..a257513b0c 100644 --- a/trove/openstack/common/network_utils.py +++ b/trove/openstack/common/network_utils.py @@ -19,7 +19,7 @@ Network-related utilities and helper functions. """ -import urlparse +import six.moves.urllib.parse as urlparse def parse_host_port(address, default_port=None):