summaryrefslogtreecommitdiff
path: root/troveclient/compat
diff options
context:
space:
mode:
authorllg8212 <lilinguo@huawei.com>2014-02-15 10:25:40 +0800
committerllg8212 <lilinguo@huawei.com>2014-02-18 10:48:16 +0800
commit5c6e00406bbffb813555e2b32d63fe3f1852d402 (patch)
tree4ae70b7c3a34c9a6404d0aebe1b2b707217c3697 /troveclient/compat
parent5fd715da78762c936566ea6e9dde5c1282b63f34 (diff)
downloadpython-troveclient-5c6e00406bbffb813555e2b32d63fe3f1852d402.tar.gz
Remove dependent module py3kcompat
Module py3kcompat was removed from oslo-incubator, we can use six directly. * Sync commit of removing py3kcompat from oslo * use six replace usage of py3kcompat Change-Id: I15b9ffb10e2d5765a1ed07dd5fd4e2bf7b21ec49 Closes-Bug: #1280033
Diffstat (limited to 'troveclient/compat')
-rw-r--r--troveclient/compat/common.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/troveclient/compat/common.py b/troveclient/compat/common.py
index 11853c3..ca4b1e6 100644
--- a/troveclient/compat/common.py
+++ b/troveclient/compat/common.py
@@ -18,14 +18,13 @@ import optparse
import os
import pickle
import six
+from six.moves.urllib import parse
import sys
from troveclient.compat import client
from troveclient.compat import xml
from troveclient.compat import exceptions
-from troveclient.openstack.common.py3kcompat import urlutils
-
def methods_of(obj):
"""Get all callable methods of an object that don't start with underscore
@@ -75,9 +74,9 @@ def limit_url(url, limit=None, marker=None):
def quote_user_host(user, host):
quoted = ''
if host:
- quoted = urlutils.quote("%s@%s" % (user, host))
+ quoted = parse.quote("%s@%s" % (user, host))
else:
- quoted = urlutils.quote("%s" % user)
+ quoted = parse.quote("%s" % user)
return quoted.replace('.', '%2e')