openstack/python-glanceclient
Code Issues Proposed changes

Merge "Don't use posixpath for URLs"

Browse Source
This commit is contained in:
Jenkins
2013-08-22 21:12:47 +00:00
committed by Gerrit Code Review
parent fe9a62b5b5 a30981e7f0
commit 835638fd8a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
glanceclient/common/http.py
View File

@@ -18,7 +18,6 @@ import errno
import hashlib import hashlib
import httplib import httplib
import logging import logging
import posixpath
import socket import socket
import StringIO import StringIO
import struct import struct
@@ -191,8 +190,8 @@ class HTTPClient(object):
try: try:
if self.endpoint_path: if self.endpoint_path:
url = '%s/%s' % (self.endpoint_path, url) url = urlparse.urljoin(self.endpoint_path, url)
conn_url = posixpath.normpath(url) conn_url = urlparse.urlsplit(url).geturl()
# Note(flaper87): Ditto, headers / url # Note(flaper87): Ditto, headers / url
# encoding to make httplib happy. # encoding to make httplib happy.
conn_url = strutils.safe_encode(conn_url) conn_url = strutils.safe_encode(conn_url)