Small no-impact code improvements

This commit is contained in:
Vincent Jacques
2012-09-08 11:18:56 +02:00
parent 3be2e82b40
commit 8335a8e4c8
3 changed files with 14 additions and 21 deletions
+1 -1
View File
@@ -1060,7 +1060,7 @@ class Repository( GithubObject.GithubObject ):
headers, data = self._requester.requestAndCheck(
"GET",
"/legacy/issues/search/" + self.owner.login + "/" + self.name + "/" + state + "/" + urllib.quote( keyword ),
{},
None,
None
)
return [
+8 -9
View File
@@ -65,21 +65,20 @@ class Requester:
def requestRaw( self, verb, url, parameters, input ):
assert verb in [ "HEAD", "GET", "POST", "PATCH", "PUT", "DELETE" ]
#URLs generated locally will be relative to __base_url
#URLs returned from the server will start with __base_url
if url.startswith( self.__base_url ):
url = url[ len(self.__base_url): ]
elif url.startswith( "/" ):
url = url
else:
assert( False ) #pragma no cover
assert url.startswith( "/" )
url = self.__prefix + url
headers = dict()
if self.__authorizationHeader is not None:
headers[ "Authorization" ] = self.__authorizationHeader
cnx = self.__connectionClass( host = self.__hostname, port = self.__port, strict = True, timeout= self.__timeout )
cnx = self.__connectionClass( host = self.__hostname, port = self.__port, strict = True, timeout = self.__timeout )
cnx.request(
verb,
self.__completeUrl( url, parameters ),
@@ -97,14 +96,14 @@ class Requester:
if "x-ratelimit-remaining" in headers and "x-ratelimit-limit" in headers:
self.rate_limiting = ( int( headers[ "x-ratelimit-remaining" ] ), int( headers[ "x-ratelimit-limit" ] ) )
# print verb, url, parameters, input, "==>", status, str( headers )[ :30 ], str( output )[ :30 ]
# print verb, self.__base_url + url, parameters, input, "==>", status, str( headers ), str( output )
return status, headers, output
def __completeUrl( self, url, parameters ):
if parameters is None or len( parameters ) == 0:
return self.__prefix + url
return url
else:
return self.__prefix + url + "?" + urllib.urlencode( parameters )
return url + "?" + urllib.urlencode( parameters )
def __structuredFromJson( self, data ):
if len( data ) == 0: