Extract Requester from Github

github/Github.py

@@ -1,51 +1,15 @@
-import httplib
-import json
-import base64
-
+from Requester import Requester
 from GithubObjects import *
 
-class UnknownGithubObject( Exception ):
-    pass
-
 class Github:
     def __init__( self, login, password ):
-        self.__login = login
-        self.__password = password
+        self.__requester = Requester( login, password )
 
     def _dataRequest( self, verb, url, parameters, data ):
-        status, headers, data = self.__rawRequest( verb, url, parameters, data )
-        if 200 <= status < 300:
-            return data
-        else:
-            raise UnknownGithubObject()
+        return self.__requester.dataRequest( verb, url, parameters, data )
 
     def _statusRequest( self, verb, url, parameters, data ):
-        status, headers, data = self.__rawRequest( verb, url, parameters, data )
-        return status
-
-    def __rawRequest( self, verb, url, parameters, input ):
-        assert verb in [ "HEAD", "GET", "POST", "PATCH", "PUT", "DELETE" ]
-
-        b64_userpass = base64.b64encode( '%s:%s' % ( self.__login, self.__password ) )
-        b64_userpass = b64_userpass.replace( '\n', '' )
-
-        input = json.dumps( input )
-
-        cnx = httplib.HTTPSConnection( "api.github.com", strict = True )
-        cnx.request( verb, url, input, { "Authorization" : "Basic " + b64_userpass } )
-        response = cnx.getresponse()
-
-        status = response.status
-        headers = dict( response.getheaders() )
-        output = response.read()
-        if len( output ) == 0:
-            output = None
-        else:
-            output = json.loads( output )
-        cnx.close()
-
-        # print verb, url, input, "==>", status, str( headers )[ :30 ], str( output )[ :30 ]
-        return status, headers, output
+        return self.__requester.statusRequest( verb, url, parameters, data )
 
     def get_user( self, login = None ):
         if login is None: