diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-16 01:25:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-16 01:25:24 +0000 |
| commit | 507f69919e78e74b1385ea359dab3a9454017008 (patch) | |
| tree | b3584d06fa6c98bb777ec4aea971fd117a712d35 /openstack/common | |
| parent | 56709a59b763a27eab7dc2abacc09e37a5bd1e0f (diff) | |
| parent | eaec23b7ca0f4f52aec643db158c22f0af0d70c1 (diff) | |
| download | oslo-507f69919e78e74b1385ea359dab3a9454017008.tar.gz oslo-507f69919e78e74b1385ea359dab3a9454017008.tar.xz oslo-507f69919e78e74b1385ea359dab3a9454017008.zip | |
Merge "py3kcompat: Add urljoin compatibility"
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/py3kcompat/urlutils.py | 2 |
1 files changed, 2 insertions, 0 deletions
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 |