Fixed 2.4 compatibility problem. Added tests to release process to make sure there are no regressions.
diff --git a/Makefile b/Makefile
index e474083..4ae3f1d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,9 @@
.PHONY: 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/*
python setup.py clean
python setup.py sdist
diff --git a/apiclient/discovery.py b/apiclient/discovery.py
index aabbade..b90486a 100644
--- a/apiclient/discovery.py
+++ b/apiclient/discovery.py
@@ -336,11 +336,11 @@
# then urlparse.urljoin will strip them out This results in an incorrect
# URL which returns a 404
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)
- url = urlparse.urljoin(new_base_url,
- url_result.path + expanded_url + query)
+ url = urlparse.urljoin(self._baseUrl,
+ url_result[2] + expanded_url + query)
logging.info('URL being requested: %s' % url)
return self._requestBuilder(self._http,