openstack/deb-python-oauth2client
Code Issues Proposed changes

Fixed 2.4 compatibility problem. Added tests to release process to make sure there are no regressions.

Browse Source
This commit is contained in:
Joe Gregorio
2011-03-18 21:52:42 -04:00
parent dd9fa86c64
commit 6f3014a508
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -11,7 +11,9 @@ docs:
.PHONY: prerelease .PHONY: prerelease
prerelease: prerelease:
python runtests.py --exit_on_failure tests python2.4 runtests.py --exit_on_failure
python2.6 runtests.py --exit_on_failure
python2.7 runtests.py --exit_on_failure
-rm dist/* -rm dist/*
python setup.py clean python setup.py clean
python setup.py sdist python setup.py sdist

6
apiclient/discovery.py
View File

@@ -336,11 +336,11 @@ def createResource(http, baseUrl, model, requestBuilder,
# then urlparse.urljoin will strip them out This results in an incorrect # then urlparse.urljoin will strip them out This results in an incorrect
# URL which returns a 404 # URL which returns a 404
url_result = urlparse.urlsplit(self._baseUrl) url_result = urlparse.urlsplit(self._baseUrl)
new_base_url = url_result.scheme + '://' + url_result.netloc new_base_url = url_result[0] + '://' + url_result[1]
expanded_url = uritemplate.expand(pathUrl, params) expanded_url = uritemplate.expand(pathUrl, params)
url = urlparse.urljoin(new_base_url, url = urlparse.urljoin(self._baseUrl,
url_result.path + expanded_url + query) url_result[2] + expanded_url + query)
logging.info('URL being requested: %s' % url) logging.info('URL being requested: %s' % url)
return self._requestBuilder(self._http, return self._requestBuilder(self._http,