Merge branch 'develop'

This commit is contained in:
Vincent Jacques
2013-04-25 20:14:31 +02:00
5 changed files with 61 additions and 4 deletions
+3 -3
View File
@@ -146,7 +146,7 @@ class Requester:
parameters = dict()
requestHeaders = dict()
self.__authenticate(requestHeaders, parameters)
self.__authenticate(url, requestHeaders, parameters)
requestHeaders["User-Agent"] = self.__userAgent
url = self.__makeAbsoluteUrl(url)
@@ -186,8 +186,8 @@ class Requester:
return status, responseHeaders, output
def __authenticate(self, requestHeaders, parameters):
if self.__clientId and self.__clientSecret:
def __authenticate(self, url, requestHeaders, parameters):
if self.__clientId and self.__clientSecret and "client_id=" not in url:
parameters["client_id"] = self.__clientId
parameters["client_secret"] = self.__clientSecret
if self.__authorizationHeader is not None: