status-im/PyGithub
1
0
Fork 0
mirror of https://github.com/status-im/PyGithub.git synced 2026-08-31 19:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'topic/Timeout' into develop

Browse Source 
Conflicts:
	github/Requester.py
This commit is contained in:
Vincent Jacques
2012-09-05 19:21:10 +02:00
parent 353fe2e50c 7ae6c60843
commit 1322002d18
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
github/Github.py
+3 -2
View File
@@ -24,10 +24,11 @@ import Legacy
import GithubObject
DEFAULT_BASE_URL = "https://api.github.com"
DEFAULT_TIMEOUT = 10
class Github( object ):
def __init__( self, login_or_token = None, password = None, base_url = DEFAULT_BASE_URL ):
self.__requester = Requester( login_or_token, password, base_url )
def __init__( self, login_or_token = None, password = None, base_url = DEFAULT_BASE_URL, timeout = DEFAULT_TIMEOUT):
self.__requester = Requester( login_or_token, password, base_url, timeout )
@property
def rate_limiting( self ):
github/Requester.py
+3 -3
View File
@@ -32,7 +32,7 @@ class Requester:
cls.__httpConnectionClass = httpConnectionClass
cls.__httpsConnectionClass = httpsConnectionClass
def __init__( self, login_or_token, password, base_url ):
def __init__( self, login_or_token, password, base_url, timeout ):
if password is not None:
login = login_or_token
self.__authorizationHeader = "Basic " + base64.b64encode( login + ":" + password ).replace( '\n', '' )
@@ -47,13 +47,13 @@ class Requester:
self.__hostname = o.hostname
self.__port = o.port
self.__prefix = o.path
self.__timeout = timeout
if o.scheme == "https":
self.__connectionClass = self.__httpsConnectionClass
elif o.scheme == "http":
self.__connectionClass = self.__httpConnectionClass
else:
assert( False ) #pragma no cover
self.rate_limiting = ( 5000, 5000 )
def requestAndCheck( self, verb, url, parameters, input ):
@@ -79,7 +79,7 @@ class Requester:
if self.__authorizationHeader is not None:
headers[ "Authorization" ] = self.__authorizationHeader
cnx = self.__connectionClass( host = self.__hostname, port = self.__port, strict = True )
cnx = self.__connectionClass( host = self.__hostname, port = self.__port, strict = True, timeout= self.__timeout )
cnx.request(
verb,
self.__completeUrl( url, parameters ),