diff --git a/github/Requester.UnitTest.py b/github/Requester.UnitTest.py index 57e66230..e35fd768 100644 --- a/github/Requester.UnitTest.py +++ b/github/Requester.UnitTest.py @@ -45,4 +45,8 @@ class TestCase( unittest.TestCase ): with self.assertRaises( UnknownGithubObject ): self.r._dataRequest( "GET", "/test", None, None ) + def testDataWithParametersAndData( self ): + self.expect( "GET", "/test?tata=tutu&toto=titi", '{"xxx": 42}', 200, [], '{ "foo": "bar" }' ) + self.assertEqual( self.r._dataRequest( "GET", "/test", { "toto" : "titi", "tata" : "tutu" }, { "xxx" : 42 } ), { "foo" : "bar" } ) + unittest.main() diff --git a/github/Requester.py b/github/Requester.py index fecbfc88..9125a688 100644 --- a/github/Requester.py +++ b/github/Requester.py @@ -27,6 +27,9 @@ class Requester: b64_userpass = base64.b64encode( '%s:%s' % ( self.__login, self.__password ) ) b64_userpass = b64_userpass.replace( '\n', '' ) + if parameters is not None: + url += "?" + "&".join( key + "=" + value for key, value in parameters.iteritems() ) + input = json.dumps( input ) cnx = httplib.HTTPSConnection( "api.github.com", strict = True )