diff --git a/codegen/JsonDescriptionOfGithubApiV3/description.000.human_readable.json b/codegen/JsonDescriptionOfGithubApiV3/description.000.human_readable.json index 45ec7654..cf25dd75 100644 --- a/codegen/JsonDescriptionOfGithubApiV3/description.000.human_readable.json +++ b/codegen/JsonDescriptionOfGithubApiV3/description.000.human_readable.json @@ -1087,10 +1087,8 @@ { "type": "argument", "value": [ "repo", "owner", "login" ] }, { "type": "constant", "value": "/" }, { "type": "argument", "value": [ "repo", "name" ] }, - { "type": "constant", "value": "/forks" } - ], - "url_parameters": [ - { "name": "org", "value": [ { "type": "attribute", "value": [ "login" ] } ] } + { "type": "constant", "value": "/forks?org=" }, + { "type": "attribute", "value": [ "login" ] } ], "information": "status" } diff --git a/codegen/JsonDescriptionOfGithubApiV3/description.001.normalized.json b/codegen/JsonDescriptionOfGithubApiV3/description.001.normalized.json index dda74cb9..30142eae 100644 --- a/codegen/JsonDescriptionOfGithubApiV3/description.001.normalized.json +++ b/codegen/JsonDescriptionOfGithubApiV3/description.001.normalized.json @@ -6340,24 +6340,17 @@ }, { "type": "constant", - "value": "/forks" - } - ], - "url_parameters": [ + "value": "/forks?org=" + }, { - "name": "org", + "type": "attribute", "value": [ - { - "type": "attribute", - "value": [ - "login" - ] - } + "login" ] } ], - "verb": "POST", - "information": "status" + "information": "status", + "verb": "POST" }, "isMutation": false, "optionalParameters": [], diff --git a/codegen/templates/GithubObject.MethodBody.DoRequest.py b/codegen/templates/GithubObject.MethodBody.DoRequest.py index dff382a9..34bc84bf 100644 --- a/codegen/templates/GithubObject.MethodBody.DoRequest.py +++ b/codegen/templates/GithubObject.MethodBody.DoRequest.py @@ -18,22 +18,9 @@ {% endif %} {% endif %} -{% if method.request.url_parameters %} - url_parameters = { - {% for parameter in method.request.url_parameters %} - "{{ parameter.name }}": {% include "GithubObject.Concatenation.py" with concatenation=parameter.value only %}, - {% endfor %} - } -{% endif %} - status, headers, data = self.__requester.request( "{{ method.request.verb }}", {% include "GithubObject.Concatenation.py" with concatenation=method.request.url only %}, -{% if method.request.url_parameters %} - url_parameters, -{% else %} - None, -{% endif %} {% if method.request.postParameters %} post_parameters {% else %} diff --git a/codegen/templates/GithubObject.py b/codegen/templates/GithubObject.py index 9bc9090b..327e5f5c 100644 --- a/codegen/templates/GithubObject.py +++ b/codegen/templates/GithubObject.py @@ -59,7 +59,6 @@ class {{ class.name }}( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/AuthenticatedUser.py b/src/github/AuthenticatedUser.py index a39a0501..7d3251f7 100644 --- a/src/github/AuthenticatedUser.py +++ b/src/github/AuthenticatedUser.py @@ -152,7 +152,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/user" + "/emails", - None, post_parameters ) @@ -160,7 +159,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "PUT", "https://api.github.com/user" + "/following" + "/" + str( following._identity ), - None, None ) @@ -168,7 +166,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "PUT", "https://api.github.com/user" + "/watched" + "/" + str( watched._identity ), - None, None ) @@ -184,7 +181,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/authorizations", - None, post_parameters ) return Authorization.Authorization( self.__requester, data, completion = NoCompletion ) @@ -193,7 +189,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/repos/" + str( repo.owner.login ) + "/" + str( repo.name ) + "/forks", - None, None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -208,7 +203,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/gists", - None, post_parameters ) return Gist.Gist( self.__requester, data, completion = NoCompletion ) @@ -221,7 +215,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/user/keys", - None, post_parameters ) return UserKey.UserKey( self.__requester, data, completion = NoCompletion ) @@ -245,7 +238,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/user" + "/repos", - None, post_parameters ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -270,7 +262,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "PATCH", "https://api.github.com/user", - None, post_parameters ) self.__useAttributes( data ) @@ -279,7 +270,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/authorizations" + "/" + str( id ), - None, None ) return Authorization.Authorization( self.__requester, data, completion = NoCompletion ) @@ -288,7 +278,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/authorizations", - None, None ) return PaginatedList.PaginatedList( @@ -302,7 +291,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/emails", - None, None ) return data @@ -311,7 +299,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/events", - None, None ) return PaginatedList.PaginatedList( @@ -325,7 +312,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/followers", - None, None ) return PaginatedList.PaginatedList( @@ -339,7 +325,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/following", - None, None ) return PaginatedList.PaginatedList( @@ -353,7 +338,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists", - None, None ) return PaginatedList.PaginatedList( @@ -367,7 +351,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/issues", - None, None ) return PaginatedList.PaginatedList( @@ -381,7 +364,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user/keys" + "/" + str( id ), - None, None ) return UserKey.UserKey( self.__requester, data, completion = NoCompletion ) @@ -390,7 +372,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user/keys", - None, None ) return PaginatedList.PaginatedList( @@ -404,7 +385,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/users/" + str( self.login ) + "/events/orgs/" + str( org.login ), - None, None ) return PaginatedList.PaginatedList( @@ -418,7 +398,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/orgs", - None, None ) return PaginatedList.PaginatedList( @@ -432,7 +411,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/repos/" + str( self.login ) + "/" + str( name ), - None, None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -441,7 +419,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/repos", - None, None ) return PaginatedList.PaginatedList( @@ -455,7 +432,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists/starred", - None, None ) return PaginatedList.PaginatedList( @@ -469,7 +445,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/watched", - None, None ) return PaginatedList.PaginatedList( @@ -483,7 +458,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/following" + "/" + str( following._identity ), - None, None ) return status == 204 @@ -492,7 +466,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/watched" + "/" + str( watched._identity ), - None, None ) return status == 204 @@ -502,7 +475,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "DELETE", "https://api.github.com/user" + "/emails", - None, post_parameters ) @@ -510,7 +482,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "DELETE", "https://api.github.com/user" + "/following" + "/" + str( following._identity ), - None, None ) @@ -518,7 +489,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "DELETE", "https://api.github.com/user" + "/watched" + "/" + str( watched._identity ), - None, None ) @@ -557,7 +527,6 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/Authorization.py b/src/github/Authorization.py index 4eefd25a..e57d6dff 100644 --- a/src/github/Authorization.py +++ b/src/github/Authorization.py @@ -62,7 +62,6 @@ class Authorization( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -82,7 +81,6 @@ class Authorization( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -106,7 +104,6 @@ class Authorization( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/Commit.py b/src/github/Commit.py index 15457962..27318f4a 100644 --- a/src/github/Commit.py +++ b/src/github/Commit.py @@ -72,7 +72,6 @@ class Commit( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/comments", - None, post_parameters ) return CommitComment.CommitComment( self.__requester, data, completion = NoCompletion ) @@ -81,7 +80,6 @@ class Commit( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", - None, None ) return PaginatedList.PaginatedList( @@ -109,7 +107,6 @@ class Commit( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/CommitComment.py b/src/github/CommitComment.py index 455f72c1..6163b2f7 100644 --- a/src/github/CommitComment.py +++ b/src/github/CommitComment.py @@ -73,7 +73,6 @@ class CommitComment( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -84,7 +83,6 @@ class CommitComment( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -110,7 +108,6 @@ class CommitComment( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/Download.py b/src/github/Download.py index be312f1f..fa3ec531 100644 --- a/src/github/Download.py +++ b/src/github/Download.py @@ -117,7 +117,6 @@ class Download( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -151,7 +150,6 @@ class Download( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/Gist.py b/src/github/Gist.py index cfa4912d..9ba7c0e3 100644 --- a/src/github/Gist.py +++ b/src/github/Gist.py @@ -99,7 +99,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/comments", - None, post_parameters ) return GistComment.GistComment( self.__requester, data, completion = NoCompletion ) @@ -108,7 +107,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/fork", - None, None ) return Gist( self.__requester, data, completion = NoCompletion ) @@ -117,7 +115,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -131,7 +128,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -140,7 +136,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists/comments/" + str( id ), - None, None ) return GistComment.GistComment( self.__requester, data, completion = NoCompletion ) @@ -149,7 +144,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", - None, None ) return PaginatedList.PaginatedList( @@ -163,7 +157,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/star", - None, None ) return status == 204 @@ -172,7 +165,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/star", - None, None ) @@ -180,7 +172,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/star", - None, None ) @@ -209,7 +200,6 @@ class Gist( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/GistComment.py b/src/github/GistComment.py index 04cfdd50..82f3e733 100644 --- a/src/github/GistComment.py +++ b/src/github/GistComment.py @@ -39,7 +39,6 @@ class GistComment( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -50,7 +49,6 @@ class GistComment( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) diff --git a/src/github/GitRef.py b/src/github/GitRef.py index 3dd733fa..aa1aecf7 100644 --- a/src/github/GitRef.py +++ b/src/github/GitRef.py @@ -27,7 +27,6 @@ class GitRef( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -40,7 +39,6 @@ class GitRef( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) diff --git a/src/github/Github.py b/src/github/Github.py index d7dee881..67d6f72f 100644 --- a/src/github/Github.py +++ b/src/github/Github.py @@ -43,7 +43,7 @@ class Github( object ): return Gist.Gist( self.__requester, attributes, completion = ImmediateCompletion ) def get_gists( self ): - status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists/public", None, None ) + status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists/public", None ) return PaginatedList.PaginatedList( Gist.Gist, self.__requester, diff --git a/src/github/Hook.py b/src/github/Hook.py index 83c6e6b8..b48d4e29 100644 --- a/src/github/Hook.py +++ b/src/github/Hook.py @@ -50,7 +50,6 @@ class Hook( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -70,7 +69,6 @@ class Hook( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -79,7 +77,6 @@ class Hook( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/test", - None, None ) diff --git a/src/github/Issue.py b/src/github/Issue.py index ad2e6a49..884fde7f 100644 --- a/src/github/Issue.py +++ b/src/github/Issue.py @@ -114,7 +114,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/labels", - None, post_parameters ) @@ -125,7 +124,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/comments", - None, post_parameters ) return IssueComment.IssueComment( self.__requester, data, completion = NoCompletion ) @@ -134,7 +132,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/labels", - None, None ) @@ -156,7 +153,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -165,7 +161,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", self.__requester.parentUrl( str( self.url ) ) + "/comments" + "/" + str( id ), - None, None ) return IssueComment.IssueComment( self.__requester, data, completion = NoCompletion ) @@ -174,7 +169,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", - None, None ) return PaginatedList.PaginatedList( @@ -188,7 +182,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events", - None, None ) return PaginatedList.PaginatedList( @@ -202,7 +195,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/labels", - None, None ) return PaginatedList.PaginatedList( @@ -216,7 +208,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/labels" + "/" + str( label._identity ), - None, None ) @@ -225,7 +216,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/labels", - None, post_parameters ) @@ -257,7 +247,6 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/IssueComment.py b/src/github/IssueComment.py index b197ef74..886f5dbf 100644 --- a/src/github/IssueComment.py +++ b/src/github/IssueComment.py @@ -39,7 +39,6 @@ class IssueComment( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -50,7 +49,6 @@ class IssueComment( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) diff --git a/src/github/IssueEvent.py b/src/github/IssueEvent.py index fafd9140..b9fd02b8 100644 --- a/src/github/IssueEvent.py +++ b/src/github/IssueEvent.py @@ -67,7 +67,6 @@ class IssueEvent( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/Label.py b/src/github/Label.py index bc365e55..7c355344 100644 --- a/src/github/Label.py +++ b/src/github/Label.py @@ -27,7 +27,6 @@ class Label( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -39,7 +38,6 @@ class Label( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) diff --git a/src/github/Milestone.py b/src/github/Milestone.py index 9679bf09..635ea998 100644 --- a/src/github/Milestone.py +++ b/src/github/Milestone.py @@ -60,7 +60,6 @@ class Milestone( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -77,7 +76,6 @@ class Milestone( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -86,7 +84,6 @@ class Milestone( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/labels", - None, None ) return PaginatedList.PaginatedList( diff --git a/src/github/NamedUser.py b/src/github/NamedUser.py index 08846bfd..51bbc42c 100644 --- a/src/github/NamedUser.py +++ b/src/github/NamedUser.py @@ -159,7 +159,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/gists", - None, post_parameters ) return Gist.Gist( self.__requester, data, completion = NoCompletion ) @@ -168,7 +167,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events", - None, None ) return PaginatedList.PaginatedList( @@ -182,7 +180,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/followers", - None, None ) return PaginatedList.PaginatedList( @@ -196,7 +193,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/following", - None, None ) return PaginatedList.PaginatedList( @@ -210,7 +206,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/gists", - None, None ) return PaginatedList.PaginatedList( @@ -224,7 +219,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/orgs", - None, None ) return PaginatedList.PaginatedList( @@ -238,7 +232,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events/public", - None, None ) return PaginatedList.PaginatedList( @@ -252,7 +245,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/received_events/public", - None, None ) return PaginatedList.PaginatedList( @@ -266,7 +258,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/received_events", - None, None ) return PaginatedList.PaginatedList( @@ -280,7 +271,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/repos/" + str( self.login ) + "/" + str( name ), - None, None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -289,7 +279,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/repos", - None, None ) return PaginatedList.PaginatedList( @@ -303,7 +292,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/watched", - None, None ) return PaginatedList.PaginatedList( @@ -353,7 +341,6 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/Organization.py b/src/github/Organization.py index 11d54fd0..29d62305 100644 --- a/src/github/Organization.py +++ b/src/github/Organization.py @@ -142,18 +142,13 @@ class Organization( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/public_members" + "/" + str( public_member._identity ), - None, None ) def create_fork( self, repo ): - url_parameters = { - "org": str( self.login ), - } status, headers, data = self.__requester.request( "POST", - "https://api.github.com/repos/" + str( repo.owner.login ) + "/" + str( repo.name ) + "/forks", - url_parameters, + "https://api.github.com/repos/" + str( repo.owner.login ) + "/" + str( repo.name ) + "/forks?org=" + str( self.login ), None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -179,7 +174,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/repos", - None, post_parameters ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -195,7 +189,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/teams", - None, post_parameters ) return Team.Team( self.__requester, data, completion = NoCompletion ) @@ -218,7 +211,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -227,7 +219,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events", - None, None ) return PaginatedList.PaginatedList( @@ -241,7 +232,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/members", - None, None ) return PaginatedList.PaginatedList( @@ -255,7 +245,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/public_members", - None, None ) return PaginatedList.PaginatedList( @@ -269,7 +258,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/repos/" + str( self.login ) + "/" + str( name ), - None, None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -278,7 +266,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/repos", - None, None ) return PaginatedList.PaginatedList( @@ -292,7 +279,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/teams/" + str( id ), - None, None ) return Team.Team( self.__requester, data, completion = NoCompletion ) @@ -301,7 +287,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/teams", - None, None ) return PaginatedList.PaginatedList( @@ -315,7 +300,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/members" + "/" + str( member._identity ), - None, None ) return status == 204 @@ -324,7 +308,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/public_members" + "/" + str( public_member._identity ), - None, None ) return status == 204 @@ -333,7 +316,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/members" + "/" + str( member._identity ), - None, None ) @@ -341,7 +323,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/public_members" + "/" + str( public_member._identity ), - None, None ) @@ -379,7 +360,6 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/PaginatedList.py b/src/github/PaginatedList.py index 6e29ed98..2d76abf9 100644 --- a/src/github/PaginatedList.py +++ b/src/github/PaginatedList.py @@ -15,7 +15,7 @@ class PaginatedList: yield element if self.__nextUrl is not None: goOn = True - status, headers, data = self.__requester.request( "GET", self.__nextUrl, None, None ) + status, headers, data = self.__requester.request( "GET", self.__nextUrl, None ) self.__fromData( headers, data ) def __getitem__( self, index ): diff --git a/src/github/PullRequest.py b/src/github/PullRequest.py index d43db8be..d4cd8832 100644 --- a/src/github/PullRequest.py +++ b/src/github/PullRequest.py @@ -157,7 +157,6 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/comments", - None, post_parameters ) return PullRequestComment.PullRequestComment( self.__requester, data, completion = NoCompletion ) @@ -174,7 +173,6 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -183,7 +181,6 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", self.__requester.parentUrl( str( self.url ) ) + "/comments" + "/" + str( id ), - None, None ) return PullRequestComment.PullRequestComment( self.__requester, data, completion = NoCompletion ) @@ -192,7 +189,6 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", - None, None ) return PaginatedList.PaginatedList( @@ -206,7 +202,6 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/commits", - None, None ) return PaginatedList.PaginatedList( @@ -220,7 +215,6 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/files", - None, None ) return PaginatedList.PaginatedList( @@ -234,7 +228,6 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/merge", - None, None ) return status == 204 @@ -247,7 +240,6 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/merge", - None, post_parameters ) @@ -287,7 +279,6 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/PullRequestComment.py b/src/github/PullRequestComment.py index c7386e9d..730fd6e0 100644 --- a/src/github/PullRequestComment.py +++ b/src/github/PullRequestComment.py @@ -73,7 +73,6 @@ class PullRequestComment( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -84,7 +83,6 @@ class PullRequestComment( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -110,7 +108,6 @@ class PullRequestComment( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/Repository.py b/src/github/Repository.py index 6418e532..8d36e375 100644 --- a/src/github/Repository.py +++ b/src/github/Repository.py @@ -191,7 +191,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/collaborators" + "/" + str( collaborator._identity ), - None, None ) @@ -199,7 +198,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/compare/" + str( base ) + "..." + str( head ), - None, None ) return data @@ -216,7 +214,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/downloads", - None, post_parameters ) return Download.Download( self.__requester, data, completion = NoCompletion ) @@ -229,7 +226,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/blobs", - None, post_parameters ) return GitBlob.GitBlob( self.__requester, data, completion = NoCompletion ) @@ -247,7 +243,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/commits", - None, post_parameters ) return GitCommit.GitCommit( self.__requester, data, completion = NoCompletion ) @@ -260,7 +255,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/refs", - None, post_parameters ) return GitRef.GitRef( self.__requester, data, completion = NoCompletion ) @@ -277,7 +271,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/tags", - None, post_parameters ) return GitTag.GitTag( self.__requester, data, completion = NoCompletion ) @@ -291,7 +284,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/trees", - None, post_parameters ) return GitTree.GitTree( self.__requester, data, completion = NoCompletion ) @@ -308,7 +300,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/hooks", - None, post_parameters ) return Hook.Hook( self.__requester, data, completion = NoCompletion ) @@ -328,7 +319,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/issues", - None, post_parameters ) return Issue.Issue( self.__requester, data, completion = NoCompletion ) @@ -341,7 +331,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/keys", - None, post_parameters ) return RepositoryKey.RepositoryKey( self.__requester, data, completion = NoCompletion, repoUrl = self.url ) @@ -354,7 +343,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/labels", - None, post_parameters ) return Label.Label( self.__requester, data, completion = NoCompletion ) @@ -372,7 +360,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/milestones", - None, post_parameters ) return Milestone.Milestone( self.__requester, data, completion = NoCompletion ) @@ -394,7 +381,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/pulls", - None, post_parameters ) return PullRequest.PullRequest( self.__requester, data, completion = NoCompletion ) @@ -418,7 +404,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -427,7 +412,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/branches", - None, None ) return PaginatedList.PaginatedList( @@ -441,7 +425,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/collaborators", - None, None ) return PaginatedList.PaginatedList( @@ -455,7 +438,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments" + "/" + str( id ), - None, None ) return CommitComment.CommitComment( self.__requester, data, completion = NoCompletion ) @@ -464,7 +446,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", - None, None ) return PaginatedList.PaginatedList( @@ -478,7 +459,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/commits" + "/" + str( sha ), - None, None ) return Commit.Commit( self.__requester, data, completion = NoCompletion ) @@ -487,7 +467,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/commits", - None, None ) return PaginatedList.PaginatedList( @@ -501,7 +480,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/contributors", - None, None ) return PaginatedList.PaginatedList( @@ -515,7 +493,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/downloads" + "/" + str( id ), - None, None ) return Download.Download( self.__requester, data, completion = NoCompletion ) @@ -524,7 +501,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/downloads", - None, None ) return PaginatedList.PaginatedList( @@ -538,7 +514,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events", - None, None ) return PaginatedList.PaginatedList( @@ -552,7 +527,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/forks", - None, None ) return PaginatedList.PaginatedList( @@ -566,7 +540,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/blobs" + "/" + str( sha ), - None, None ) return GitBlob.GitBlob( self.__requester, data, completion = NoCompletion ) @@ -575,7 +548,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/commits" + "/" + str( sha ), - None, None ) return GitCommit.GitCommit( self.__requester, data, completion = NoCompletion ) @@ -584,7 +556,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/" + str( ref ), - None, None ) return GitRef.GitRef( self.__requester, data, completion = NoCompletion ) @@ -593,7 +564,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/refs", - None, None ) return PaginatedList.PaginatedList( @@ -607,7 +577,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/tags" + "/" + str( sha ), - None, None ) return GitTag.GitTag( self.__requester, data, completion = NoCompletion ) @@ -616,7 +585,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/trees" + "/" + str( sha ), - None, None ) return GitTree.GitTree( self.__requester, data, completion = NoCompletion ) @@ -625,7 +593,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/hooks" + "/" + str( id ), - None, None ) return Hook.Hook( self.__requester, data, completion = NoCompletion ) @@ -634,7 +601,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/hooks", - None, None ) return PaginatedList.PaginatedList( @@ -648,7 +614,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/issues" + "/" + str( number ), - None, None ) return Issue.Issue( self.__requester, data, completion = NoCompletion ) @@ -657,7 +622,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/issues", - None, None ) return PaginatedList.PaginatedList( @@ -671,7 +635,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/issues/events" + "/" + str( id ), - None, None ) return IssueEvent.IssueEvent( self.__requester, data, completion = NoCompletion ) @@ -680,7 +643,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/issues/events", - None, None ) return PaginatedList.PaginatedList( @@ -694,7 +656,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/keys" + "/" + str( id ), - None, None ) return RepositoryKey.RepositoryKey( self.__requester, data, completion = NoCompletion, repoUrl = self.url ) @@ -703,7 +664,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/keys", - None, None ) return PaginatedList.PaginatedList( @@ -717,7 +677,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/labels/" + urllib.quote( str( name ) ), - None, None ) return Label.Label( self.__requester, data, completion = NoCompletion ) @@ -726,7 +685,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/labels", - None, None ) return PaginatedList.PaginatedList( @@ -740,7 +698,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/languages", - None, None ) return data @@ -749,7 +706,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/milestones" + "/" + str( number ), - None, None ) return Milestone.Milestone( self.__requester, data, completion = NoCompletion ) @@ -758,7 +714,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/milestones", - None, None ) return PaginatedList.PaginatedList( @@ -772,7 +727,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/networks/" + str( self.owner.login ) + "/" + str( self.name ) + "/events", - None, None ) return PaginatedList.PaginatedList( @@ -786,7 +740,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/pulls" + "/" + str( number ), - None, None ) return PullRequest.PullRequest( self.__requester, data, completion = NoCompletion ) @@ -795,7 +748,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/pulls", - None, None ) return PaginatedList.PaginatedList( @@ -809,7 +761,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/tags", - None, None ) return PaginatedList.PaginatedList( @@ -823,7 +774,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/teams", - None, None ) return PaginatedList.PaginatedList( @@ -837,7 +787,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/watchers", - None, None ) return PaginatedList.PaginatedList( @@ -851,7 +800,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/collaborators" + "/" + str( collaborator._identity ), - None, None ) return status == 204 @@ -860,7 +808,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/collaborators" + "/" + str( collaborator._identity ), - None, None ) @@ -908,7 +855,6 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/RepositoryKey.py b/src/github/RepositoryKey.py index 0779f13a..9127cb50 100644 --- a/src/github/RepositoryKey.py +++ b/src/github/RepositoryKey.py @@ -47,7 +47,6 @@ class RepositoryKey( object ): status, headers, data = self.__requester.request( "DELETE", self.__customUrl, - None, None ) @@ -61,7 +60,6 @@ class RepositoryKey( object ): status, headers, data = self.__requester.request( "PATCH", self.__customUrl, - None, post_parameters ) self.__useAttributes( data ) @@ -81,7 +79,6 @@ class RepositoryKey( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/Requester.py b/src/github/Requester.py index 8ccb30b8..6a64b6b8 100644 --- a/src/github/Requester.py +++ b/src/github/Requester.py @@ -18,7 +18,7 @@ class Requester: self.__authorizationHeader = None self.rate_limiting = ( 5000, 5000 ) - def request( self, verb, url, parameters, input ): + def request( self, verb, url, input ): assert verb in [ "HEAD", "GET", "POST", "PATCH", "PUT", "DELETE" ] assert url.startswith( "https://api.github.com" ) url = url[ len( "https://api.github.com" ) : ] @@ -30,7 +30,7 @@ class Requester: cnx = httplib.HTTPSConnection( "api.github.com", strict = True ) cnx.request( verb, - self.__completeUrl( url, parameters ), + url, json.dumps( input ), headers ) @@ -44,15 +44,9 @@ class Requester: 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, url, input, "==>", status, str( headers )[ :30 ], str( output )[ :30 ] return status, headers, output - def __completeUrl( self, url, parameters ): - if parameters is None or len( parameters ) == 0: - return url - else: - return url + "?" + urllib.urlencode( parameters ) - def __structuredFromJson( self, data ): if len( data ) == 0: return None diff --git a/src/github/Team.py b/src/github/Team.py index 716e80cc..531dd44e 100644 --- a/src/github/Team.py +++ b/src/github/Team.py @@ -49,7 +49,6 @@ class Team( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/members" + "/" + str( member._identity ), - None, None ) @@ -57,7 +56,6 @@ class Team( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/repos" + "/" + str( repo._identity ), - None, None ) @@ -65,7 +63,6 @@ class Team( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -78,7 +75,6 @@ class Team( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -87,7 +83,6 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/members", - None, None ) return PaginatedList.PaginatedList( @@ -101,7 +96,6 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/repos", - None, None ) return PaginatedList.PaginatedList( @@ -115,7 +109,6 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/members" + "/" + str( member._identity ), - None, None ) return status == 204 @@ -124,7 +117,6 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/repos" + "/" + str( repo._identity ), - None, None ) return status == 204 @@ -133,7 +125,6 @@ class Team( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/members" + "/" + str( member._identity ), - None, None ) @@ -141,7 +132,6 @@ class Team( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/repos" + "/" + str( repo._identity ), - None, None ) @@ -161,7 +151,6 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data ) diff --git a/src/github/UserKey.py b/src/github/UserKey.py index acfed3f4..02758bf0 100644 --- a/src/github/UserKey.py +++ b/src/github/UserKey.py @@ -42,7 +42,6 @@ class UserKey( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), - None, None ) @@ -56,7 +55,6 @@ class UserKey( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), - None, post_parameters ) self.__useAttributes( data ) @@ -76,7 +74,6 @@ class UserKey( object ): status, headers, data = self.__requester.request( "GET", self.__url, - None, None ) self.__useAttributes( data )