From eaec23b7ca0f4f52aec643db158c22f0af0d70c1 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Wed, 14 Aug 2013 07:51:53 -0400 Subject: py3kcompat: Add urljoin compatibility Add urljoin for python2/python3 compatibility, used by python-keystoneclient. Change-Id: Ied0841bf6b34d0087002c77915031156767b3d8d Signed-off-by: Chuck Short --- openstack/common/py3kcompat/urlutils.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'openstack') diff --git a/openstack/common/py3kcompat/urlutils.py b/openstack/common/py3kcompat/urlutils.py index 95ad274..04b3418 100644 --- a/openstack/common/py3kcompat/urlutils.py +++ b/openstack/common/py3kcompat/urlutils.py @@ -27,6 +27,7 @@ if six.PY3: import urllib.parse urlencode = urllib.parse.urlencode + urljoin = urllib.parse.urljoin quote = urllib.parse.quote parse_qsl = urllib.parse.parse_qsl urlparse = urllib.parse.urlparse @@ -42,6 +43,7 @@ else: parse = urlparse parse_qsl = parse.parse_qsl + urljoin = parse.urljoin urlparse = parse.urlparse urlsplit = parse.urlsplit urlunsplit = parse.urlunsplit -- cgit