From f2feb81dae1b28af80c559db7328f2d6fe017911 Mon Sep 17 00:00:00 2001 From: Vincent Jacques Date: Thu, 5 Sep 2013 18:56:56 +0200 Subject: [PATCH] Add default parameters to greatly reduce code redoundancy --- github/AuthenticatedUser.py | 118 +++++---------------- github/Authorization.py | 9 +- github/Commit.py | 8 +- github/CommitComment.py | 9 +- github/Download.py | 5 +- github/Gist.py | 38 ++----- github/GistComment.py | 9 +- github/GitRef.py | 9 +- github/GithubObject.py | 9 +- github/Hook.py | 14 +-- github/Issue.py | 31 ++---- github/IssueComment.py | 9 +- github/Label.py | 9 +- github/Legacy.py | 4 +- github/MainClass.py | 54 ++-------- github/Milestone.py | 9 +- github/NamedUser.py | 14 +-- github/Organization.py | 51 ++------- github/PaginatedList.py | 12 +-- github/PullRequest.py | 31 ++---- github/PullRequestComment.py | 9 +- github/Repository.py | 200 ++++++++--------------------------- github/RepositoryKey.py | 9 +- github/Requester.py | 8 +- github/Team.py | 39 ++----- github/UserKey.py | 9 +- 26 files changed, 160 insertions(+), 566 deletions(-) diff --git a/github/AuthenticatedUser.py b/github/AuthenticatedUser.py index d403893f..67a289c3 100644 --- a/github/AuthenticatedUser.py +++ b/github/AuthenticatedUser.py @@ -257,9 +257,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", "/user/emails", - None, - None, - post_parameters + input=post_parameters ) def add_to_following(self, following): @@ -271,10 +269,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(following, github.NamedUser.NamedUser), following headers, data = self._requester.requestJsonAndCheck( "PUT", - "/user/following/" + following._identity, - None, - None, - None + "/user/following/" + following._identity ) def add_to_starred(self, starred): @@ -286,10 +281,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(starred, github.Repository.Repository), starred headers, data = self._requester.requestJsonAndCheck( "PUT", - "/user/starred/" + starred._identity, - None, - None, - None + "/user/starred/" + starred._identity ) def add_to_subscriptions(self, subscription): @@ -301,10 +293,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(subscription, github.Repository.Repository), subscription headers, data = self._requester.requestJsonAndCheck( "PUT", - "/user/subscriptions/" + subscription._identity, - None, - None, - None + "/user/subscriptions/" + subscription._identity ) def add_to_watched(self, watched): @@ -316,10 +305,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(watched, github.Repository.Repository), watched headers, data = self._requester.requestJsonAndCheck( "PUT", - "/user/watched/" + watched._identity, - None, - None, - None + "/user/watched/" + watched._identity ) def create_authorization(self, scopes=github.GithubObject.NotSet, note=github.GithubObject.NotSet, note_url=github.GithubObject.NotSet, client_id=github.GithubObject.NotSet, client_secret=github.GithubObject.NotSet): @@ -351,9 +337,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", "/authorizations", - None, - None, - post_parameters + input=post_parameters ) return github.Authorization.Authorization(self._requester, headers, data, completed=True) @@ -366,10 +350,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(repo, github.Repository.Repository), repo headers, data = self._requester.requestJsonAndCheck( "POST", - "/repos/" + repo.owner.login + "/" + repo.name + "/forks", - None, - None, - None + "/repos/" + repo.owner.login + "/" + repo.name + "/forks" ) return github.Repository.Repository(self._requester, headers, data, completed=True) @@ -393,9 +374,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", "/gists", - None, - None, - post_parameters + input=post_parameters ) return github.Gist.Gist(self._requester, headers, data, completed=True) @@ -415,9 +394,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", "/user/keys", - None, - None, - post_parameters + input=post_parameters ) return github.UserKey.UserKey(self._requester, headers, data, completed=True) @@ -466,9 +443,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", "/user/repos", - None, - None, - post_parameters + input=post_parameters ) return github.Repository.Repository(self._requester, headers, data, completed=True) @@ -509,9 +484,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", "/user", - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) @@ -524,10 +497,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - "/authorizations/" + str(id), - None, - None, - None + "/authorizations/" + str(id) ) return github.Authorization.Authorization(self._requester, headers, data, completed=True) @@ -550,10 +520,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "GET", - "/user/emails", - None, - None, - None + "/user/emails" ) return data @@ -690,10 +657,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - "/user/keys/" + str(id), - None, - None, - None + "/user/keys/" + str(id) ) return github.UserKey.UserKey(self._requester, headers, data, completed=True) @@ -718,10 +682,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(id, (str, unicode)), id headers, data = self._requester.requestJsonAndCheck( "GET", - "/notifications/threads/" + id, - None, - None, - None + "/notifications/threads/" + id ) return github.Notification.Notification(self._requester, headers, data, completed=True) @@ -783,10 +744,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(name, (str, unicode)), name headers, data = self._requester.requestJsonAndCheck( "GET", - "/repos/" + self.login + "/" + name, - None, - None, - None + "/repos/" + self.login + "/" + name ) return github.Repository.Repository(self._requester, headers, data, completed=True) @@ -872,10 +830,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(following, github.NamedUser.NamedUser), following status, headers, data = self._requester.requestJson( "GET", - "/user/following/" + following._identity, - None, - None, - None + "/user/following/" + following._identity ) return status == 204 @@ -888,10 +843,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(starred, github.Repository.Repository), starred status, headers, data = self._requester.requestJson( "GET", - "/user/starred/" + starred._identity, - None, - None, - None + "/user/starred/" + starred._identity ) return status == 204 @@ -904,10 +856,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(subscription, github.Repository.Repository), subscription status, headers, data = self._requester.requestJson( "GET", - "/user/subscriptions/" + subscription._identity, - None, - None, - None + "/user/subscriptions/" + subscription._identity ) return status == 204 @@ -920,10 +869,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(watched, github.Repository.Repository), watched status, headers, data = self._requester.requestJson( "GET", - "/user/watched/" + watched._identity, - None, - None, - None + "/user/watched/" + watched._identity ) return status == 204 @@ -938,9 +884,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "DELETE", "/user/emails", - None, - None, - post_parameters + input=post_parameters ) def remove_from_following(self, following): @@ -952,10 +896,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(following, github.NamedUser.NamedUser), following headers, data = self._requester.requestJsonAndCheck( "DELETE", - "/user/following/" + following._identity, - None, - None, - None + "/user/following/" + following._identity ) def remove_from_starred(self, starred): @@ -967,10 +908,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(starred, github.Repository.Repository), starred headers, data = self._requester.requestJsonAndCheck( "DELETE", - "/user/starred/" + starred._identity, - None, - None, - None + "/user/starred/" + starred._identity ) def remove_from_subscriptions(self, subscription): @@ -982,10 +920,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(subscription, github.Repository.Repository), subscription headers, data = self._requester.requestJsonAndCheck( "DELETE", - "/user/subscriptions/" + subscription._identity, - None, - None, - None + "/user/subscriptions/" + subscription._identity ) def remove_from_watched(self, watched): @@ -997,10 +932,7 @@ class AuthenticatedUser(github.GithubObject.CompletableGithubObject): assert isinstance(watched, github.Repository.Repository), watched headers, data = self._requester.requestJsonAndCheck( "DELETE", - "/user/watched/" + watched._identity, - None, - None, - None + "/user/watched/" + watched._identity ) def _initAttributes(self): diff --git a/github/Authorization.py b/github/Authorization.py index f287a2b6..a004fedf 100644 --- a/github/Authorization.py +++ b/github/Authorization.py @@ -113,10 +113,7 @@ class Authorization(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, scopes=github.GithubObject.NotSet, add_scopes=github.GithubObject.NotSet, remove_scopes=github.GithubObject.NotSet, note=github.GithubObject.NotSet, note_url=github.GithubObject.NotSet): @@ -148,9 +145,7 @@ class Authorization(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) diff --git a/github/Commit.py b/github/Commit.py index ad744e39..828da3fe 100644 --- a/github/Commit.py +++ b/github/Commit.py @@ -130,9 +130,7 @@ class Commit(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/comments", - None, - None, - post_parameters + input=post_parameters ) return github.CommitComment.CommitComment(self._requester, headers, data, completed=True) @@ -157,9 +155,7 @@ class Commit(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self._parentUrl(self._parentUrl(self.url)) + "/statuses/" + self.sha, - None, - None, - post_parameters + input=post_parameters ) return github.CommitStatus.CommitStatus(self._requester, headers, data, completed=True) diff --git a/github/CommitComment.py b/github/CommitComment.py index 061737bf..c2c897d1 100644 --- a/github/CommitComment.py +++ b/github/CommitComment.py @@ -129,10 +129,7 @@ class CommitComment(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, body): @@ -148,9 +145,7 @@ class CommitComment(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) diff --git a/github/Download.py b/github/Download.py index a4b3b656..2cd057ca 100644 --- a/github/Download.py +++ b/github/Download.py @@ -199,10 +199,7 @@ class Download(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def _initAttributes(self): diff --git a/github/Gist.py b/github/Gist.py index de4ded9e..65de668e 100644 --- a/github/Gist.py +++ b/github/Gist.py @@ -172,9 +172,7 @@ class Gist(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/comments", - None, - None, - post_parameters + input=post_parameters ) return github.GistComment.GistComment(self._requester, headers, data, completed=True) @@ -185,10 +183,7 @@ class Gist(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "POST", - self.url + "/forks", - None, - None, - None + self.url + "/forks" ) return Gist(self._requester, headers, data, completed=True) @@ -199,10 +194,7 @@ class Gist(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, description=github.GithubObject.NotSet, files=github.GithubObject.NotSet): @@ -222,9 +214,7 @@ class Gist(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) @@ -237,10 +227,7 @@ class Gist(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/comments/" + str(id), - None, - None, - None + self.url + "/comments/" + str(id) ) return github.GistComment.GistComment(self._requester, headers, data, completed=True) @@ -263,10 +250,7 @@ class Gist(github.GithubObject.CompletableGithubObject): """ status, headers, data = self._requester.requestJson( "GET", - self.url + "/star", - None, - None, - None + self.url + "/star" ) return status == 204 @@ -277,10 +261,7 @@ class Gist(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url + "/star", - None, - None, - None + self.url + "/star" ) def set_starred(self): @@ -290,10 +271,7 @@ class Gist(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "PUT", - self.url + "/star", - None, - None, - None + self.url + "/star" ) def _initAttributes(self): diff --git a/github/GistComment.py b/github/GistComment.py index f0b5c80c..5ee0664c 100644 --- a/github/GistComment.py +++ b/github/GistComment.py @@ -89,10 +89,7 @@ class GistComment(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, body): @@ -108,9 +105,7 @@ class GistComment(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) diff --git a/github/GitRef.py b/github/GitRef.py index 84ec00c5..97a2ca4d 100644 --- a/github/GitRef.py +++ b/github/GitRef.py @@ -65,10 +65,7 @@ class GitRef(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, sha, force=github.GithubObject.NotSet): @@ -88,9 +85,7 @@ class GitRef(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) diff --git a/github/GithubObject.py b/github/GithubObject.py index c2ae7f6d..91c079b7 100644 --- a/github/GithubObject.py +++ b/github/GithubObject.py @@ -141,10 +141,7 @@ class CompletableGithubObject(GithubObject): def __complete(self): headers, data = self._requester.requestJsonAndCheck( "GET", - self._url, - None, - None, - None + self._url ) self._storeAndUseAttributes(headers, data) self.__completed = True @@ -163,9 +160,7 @@ class CompletableGithubObject(GithubObject): status, responseHeaders, output = self._requester.requestJson( "GET", self._url, - None, - conditionalRequestHeader, - None + headers=conditionalRequestHeader ) if status == 304: return False diff --git a/github/Hook.py b/github/Hook.py index ea0be67b..447a0e9a 100644 --- a/github/Hook.py +++ b/github/Hook.py @@ -113,10 +113,7 @@ class Hook(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, name, config, events=github.GithubObject.NotSet, add_events=github.GithubObject.NotSet, remove_events=github.GithubObject.NotSet, active=github.GithubObject.NotSet): @@ -151,9 +148,7 @@ class Hook(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) @@ -164,10 +159,7 @@ class Hook(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "POST", - self.url + "/tests", - None, - None, - None + self.url + "/tests" ) def _initAttributes(self): diff --git a/github/Issue.py b/github/Issue.py index 260967d3..b849e8d4 100644 --- a/github/Issue.py +++ b/github/Issue.py @@ -203,9 +203,7 @@ class Issue(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/labels", - None, - None, - post_parameters + input=post_parameters ) def create_comment(self, body): @@ -221,9 +219,7 @@ class Issue(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/comments", - None, - None, - post_parameters + input=post_parameters ) return github.IssueComment.IssueComment(self._requester, headers, data, completed=True) @@ -234,10 +230,7 @@ class Issue(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url + "/labels", - None, - None, - None + self.url + "/labels" ) def edit(self, title=github.GithubObject.NotSet, body=github.GithubObject.NotSet, assignee=github.GithubObject.NotSet, state=github.GithubObject.NotSet, milestone=github.GithubObject.NotSet, labels=github.GithubObject.NotSet): @@ -273,9 +266,7 @@ class Issue(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) @@ -288,10 +279,7 @@ class Issue(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - self._parentUrl(self.url) + "/comments/" + str(id), - None, - None, - None + self._parentUrl(self.url) + "/comments/" + str(id) ) return github.IssueComment.IssueComment(self._requester, headers, data, completed=True) @@ -340,10 +328,7 @@ class Issue(github.GithubObject.CompletableGithubObject): assert isinstance(label, github.Label.Label), label headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url + "/labels/" + label._identity, - None, - None, - None + self.url + "/labels/" + label._identity ) def set_labels(self, *labels): @@ -357,9 +342,7 @@ class Issue(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PUT", self.url + "/labels", - None, - None, - post_parameters + input=post_parameters ) @property diff --git a/github/IssueComment.py b/github/IssueComment.py index c1af97f8..149a6f6f 100644 --- a/github/IssueComment.py +++ b/github/IssueComment.py @@ -98,10 +98,7 @@ class IssueComment(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, body): @@ -117,9 +114,7 @@ class IssueComment(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) diff --git a/github/Label.py b/github/Label.py index b961af18..813cd5f0 100644 --- a/github/Label.py +++ b/github/Label.py @@ -66,10 +66,7 @@ class Label(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, name, color): @@ -88,9 +85,7 @@ class Label(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) diff --git a/github/Legacy.py b/github/Legacy.py index a0e3493f..cfe48d67 100644 --- a/github/Legacy.py +++ b/github/Legacy.py @@ -58,9 +58,7 @@ class PaginatedList(github.PaginatedList.PaginatedListBase): headers, data = self.__requester.requestJsonAndCheck( "GET", self.__url, - args, - None, - None + parameters=args ) self.__continue = len(data[self.__key]) > 0 diff --git a/github/MainClass.py b/github/MainClass.py index 676fa914..2b1e298d 100644 --- a/github/MainClass.py +++ b/github/MainClass.py @@ -109,10 +109,7 @@ class Github(object): if limit < 0: self.__requester.requestJsonAndCheck( 'GET', - '/rate_limit', - None, - None, - None + '/rate_limit' ) return self.__requester.rate_limiting @@ -125,10 +122,7 @@ class Github(object): if self.__requester.rate_limiting_resettime == 0: self.__requester.requestJsonAndCheck( 'GET', - '/rate_limit', - None, - None, - None + '/rate_limit' ) return self.__requester.rate_limiting_resettime @@ -151,10 +145,7 @@ class Github(object): else: headers, data = self.__requester.requestJsonAndCheck( "GET", - "/users/" + login, - None, - None, - None + "/users/" + login ) return github.NamedUser.NamedUser(self.__requester, headers, data, completed=True) @@ -184,10 +175,7 @@ class Github(object): assert isinstance(login, (str, unicode)), login headers, data = self.__requester.requestJsonAndCheck( "GET", - "/orgs/" + login, - None, - None, - None + "/orgs/" + login ) return github.Organization.Organization(self.__requester, headers, data, completed=True) @@ -199,10 +187,7 @@ class Github(object): assert isinstance(full_name, (str, unicode)), full_name headers, data = self.__requester.requestJsonAndCheck( "GET", - "/repos/" + full_name, - None, - None, - None + "/repos/" + full_name ) return Repository.Repository(self.__requester, headers, data, completed=True) @@ -232,10 +217,7 @@ class Github(object): assert isinstance(id, (str, unicode)), id headers, data = self.__requester.requestJsonAndCheck( "GET", - "/gists/" + id, - None, - None, - None + "/gists/" + id ) return github.Gist.Gist(self.__requester, headers, data, completed=True) @@ -295,10 +277,7 @@ class Github(object): assert isinstance(email, (str, unicode)), email headers, data = self.__requester.requestJsonAndCheck( "GET", - "/legacy/user/email/" + email, - None, - None, - None + "/legacy/user/email/" + email ) return github.NamedUser.NamedUser(self.__requester, headers, Legacy.convertUser(data["user"]), completed=False) @@ -320,9 +299,7 @@ class Github(object): status, headers, data = self.__requester.requestJson( "POST", "/markdown", - None, - None, - post_parameters + input=post_parameters ) return data @@ -333,10 +310,7 @@ class Github(object): """ headers, data = self.__requester.requestJsonAndCheck( "GET", - "/hooks", - None, - None, - None + "/hooks" ) return [HookDescription.HookDescription(self.__requester, headers, attributes, completed=True) for attributes in data] @@ -347,10 +321,7 @@ class Github(object): """ headers, data = self.__requester.requestJsonAndCheck( "GET", - "/gitignore/templates", - None, - None, - None + "/gitignore/templates" ) return data @@ -362,10 +333,7 @@ class Github(object): assert isinstance(name, (str, unicode)), name headers, attributes = self.__requester.requestJsonAndCheck( "GET", - "/gitignore/templates/" + name, - None, - None, - None + "/gitignore/templates/" + name ) return GitignoreTemplate.GitignoreTemplate(self.__requester, headers, attributes, completed=True) diff --git a/github/Milestone.py b/github/Milestone.py index 0f23eb78..c07ec389 100644 --- a/github/Milestone.py +++ b/github/Milestone.py @@ -134,10 +134,7 @@ class Milestone(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, title, state=github.GithubObject.NotSet, description=github.GithubObject.NotSet, due_on=github.GithubObject.NotSet): @@ -165,9 +162,7 @@ class Milestone(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) diff --git a/github/NamedUser.py b/github/NamedUser.py index 435b1bf2..ec9bfbed 100644 --- a/github/NamedUser.py +++ b/github/NamedUser.py @@ -269,9 +269,7 @@ class NamedUser(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/gists", - None, - None, - post_parameters + input=post_parameters ) return github.Gist.Gist(self._requester, headers, data, completed=True) @@ -392,10 +390,7 @@ class NamedUser(github.GithubObject.CompletableGithubObject): assert isinstance(name, (str, unicode)), name headers, data = self._requester.requestJsonAndCheck( "GET", - "/repos/" + self.login + "/" + name, - None, - None, - None + "/repos/" + self.login + "/" + name ) return github.Repository.Repository(self._requester, headers, data, completed=True) @@ -461,10 +456,7 @@ class NamedUser(github.GithubObject.CompletableGithubObject): assert isinstance(following, github.NamedUser.NamedUser), following status, headers, data = self._requester.requestJson( "GET", - self.url + "/following/" + following._identity, - None, - None, - None + self.url + "/following/" + following._identity ) return status == 204 diff --git a/github/Organization.py b/github/Organization.py index aa904fce..68245f3e 100644 --- a/github/Organization.py +++ b/github/Organization.py @@ -244,10 +244,7 @@ class Organization(github.GithubObject.CompletableGithubObject): assert isinstance(public_member, github.NamedUser.NamedUser), public_member headers, data = self._requester.requestJsonAndCheck( "PUT", - self.url + "/public_members/" + public_member._identity, - None, - None, - None + self.url + "/public_members/" + public_member._identity ) def create_fork(self, repo): @@ -263,9 +260,7 @@ class Organization(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", "/repos/" + repo.owner.login + "/" + repo.name + "/forks", - url_parameters, - None, - None + parameters=url_parameters ) return github.Repository.Repository(self._requester, headers, data, completed=True) @@ -318,9 +313,7 @@ class Organization(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/repos", - None, - None, - post_parameters + input=post_parameters ) return github.Repository.Repository(self._requester, headers, data, completed=True) @@ -345,9 +338,7 @@ class Organization(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/teams", - None, - None, - post_parameters + input=post_parameters ) return github.Team.Team(self._requester, headers, data, completed=True) @@ -384,9 +375,7 @@ class Organization(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) @@ -473,10 +462,7 @@ class Organization(github.GithubObject.CompletableGithubObject): assert isinstance(name, (str, unicode)), name headers, data = self._requester.requestJsonAndCheck( "GET", - "/repos/" + self.login + "/" + name, - None, - None, - None + "/repos/" + self.login + "/" + name ) return github.Repository.Repository(self._requester, headers, data, completed=True) @@ -506,10 +492,7 @@ class Organization(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - "/teams/" + str(id), - None, - None, - None + "/teams/" + str(id) ) return github.Team.Team(self._requester, headers, data, completed=True) @@ -534,10 +517,7 @@ class Organization(github.GithubObject.CompletableGithubObject): assert isinstance(member, github.NamedUser.NamedUser), member status, headers, data = self._requester.requestJson( "GET", - self.url + "/members/" + member._identity, - None, - None, - None + self.url + "/members/" + member._identity ) return status == 204 @@ -550,10 +530,7 @@ class Organization(github.GithubObject.CompletableGithubObject): assert isinstance(public_member, github.NamedUser.NamedUser), public_member status, headers, data = self._requester.requestJson( "GET", - self.url + "/public_members/" + public_member._identity, - None, - None, - None + self.url + "/public_members/" + public_member._identity ) return status == 204 @@ -566,10 +543,7 @@ class Organization(github.GithubObject.CompletableGithubObject): assert isinstance(member, github.NamedUser.NamedUser), member headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url + "/members/" + member._identity, - None, - None, - None + self.url + "/members/" + member._identity ) def remove_from_public_members(self, public_member): @@ -581,10 +555,7 @@ class Organization(github.GithubObject.CompletableGithubObject): assert isinstance(public_member, github.NamedUser.NamedUser), public_member headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url + "/public_members/" + public_member._identity, - None, - None, - None + self.url + "/public_members/" + public_member._identity ) def _initAttributes(self): diff --git a/github/PaginatedList.py b/github/PaginatedList.py index 45b2546d..4c22b991 100644 --- a/github/PaginatedList.py +++ b/github/PaginatedList.py @@ -122,9 +122,7 @@ class PaginatedList(PaginatedListBase): headers, data = self.__requester.requestJsonAndCheck( "GET", self.__firstUrl, - self.__nextParams, - None, - None + parameters=self.__nextParams ) links = self.__parseLinkHeader(headers) lastUrl = links.get("last") @@ -149,9 +147,7 @@ class PaginatedList(PaginatedListBase): headers, data = self.__requester.requestJsonAndCheck( "GET", self.__nextUrl, - self.__nextParams, - None, - None + parameters=self.__nextParams ) self.__nextUrl = None @@ -192,9 +188,7 @@ class PaginatedList(PaginatedListBase): headers, data = self.__requester.requestJsonAndCheck( "GET", self.__firstUrl, - params, - None, - None + parameters=params ) return [ diff --git a/github/PullRequest.py b/github/PullRequest.py index 2b9b022b..85867c60 100644 --- a/github/PullRequest.py +++ b/github/PullRequest.py @@ -292,9 +292,7 @@ class PullRequest(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/comments", - None, - None, - post_parameters + input=post_parameters ) return github.PullRequestComment.PullRequestComment(self._requester, headers, data, completed=True) @@ -311,9 +309,7 @@ class PullRequest(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self._parentUrl(self._parentUrl(self.url)) + "/issues/" + str(self.number) + "/comments", - None, - None, - post_parameters + input=post_parameters ) return github.IssueComment.IssueComment(self._requester, headers, data, completed=True) @@ -338,9 +334,7 @@ class PullRequest(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) @@ -361,10 +355,7 @@ class PullRequest(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - self._parentUrl(self.url) + "/comments/" + str(id), - None, - None, - None + self._parentUrl(self.url) + "/comments/" + str(id) ) return github.PullRequestComment.PullRequestComment(self._requester, headers, data, completed=True) @@ -420,10 +411,7 @@ class PullRequest(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - self._parentUrl(self._parentUrl(self.url)) + "/issues/comments/" + str(id), - None, - None, - None + self._parentUrl(self._parentUrl(self.url)) + "/issues/comments/" + str(id) ) return github.IssueComment.IssueComment(self._requester, headers, data, completed=True) @@ -446,10 +434,7 @@ class PullRequest(github.GithubObject.CompletableGithubObject): """ status, headers, data = self._requester.requestJson( "GET", - self.url + "/merge", - None, - None, - None + self.url + "/merge" ) return status == 204 @@ -466,9 +451,7 @@ class PullRequest(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PUT", self.url + "/merge", - None, - None, - post_parameters + input=post_parameters ) return github.PullRequestMergeStatus.PullRequestMergeStatus(self._requester, headers, data, completed=True) diff --git a/github/PullRequestComment.py b/github/PullRequestComment.py index 4d250d56..1e96426e 100644 --- a/github/PullRequestComment.py +++ b/github/PullRequestComment.py @@ -139,10 +139,7 @@ class PullRequestComment(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, body): @@ -158,9 +155,7 @@ class PullRequestComment(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) diff --git a/github/Repository.py b/github/Repository.py index 9a62e13d..7eb3d235 100644 --- a/github/Repository.py +++ b/github/Repository.py @@ -317,10 +317,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(collaborator, github.NamedUser.NamedUser), collaborator headers, data = self._requester.requestJsonAndCheck( "PUT", - self.url + "/collaborators/" + collaborator._identity, - None, - None, - None + self.url + "/collaborators/" + collaborator._identity ) def compare(self, base, head): @@ -334,10 +331,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(head, (str, unicode)), head headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/compare/" + base + "..." + head, - None, - None, - None + self.url + "/compare/" + base + "..." + head ) return github.Comparison.Comparison(self._requester, headers, data, completed=True) @@ -365,9 +359,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/downloads", - None, - None, - post_parameters + input=post_parameters ) return github.Download.Download(self._requester, headers, data, completed=True) @@ -387,9 +379,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/blobs", - None, - None, - post_parameters + input=post_parameters ) return github.GitBlob.GitBlob(self._requester, headers, data, completed=True) @@ -420,9 +410,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/commits", - None, - None, - post_parameters + input=post_parameters ) return github.GitCommit.GitCommit(self._requester, headers, data, completed=True) @@ -442,9 +430,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/refs", - None, - None, - post_parameters + input=post_parameters ) return github.GitRef.GitRef(self._requester, headers, data, completed=True) @@ -474,9 +460,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/tags", - None, - None, - post_parameters + input=post_parameters ) return github.GitTag.GitTag(self._requester, headers, data, completed=True) @@ -497,9 +481,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/trees", - None, - None, - post_parameters + input=post_parameters ) return github.GitTree.GitTree(self._requester, headers, data, completed=True) @@ -527,9 +509,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/hooks", - None, - None, - post_parameters + input=post_parameters ) return github.Hook.Hook(self._requester, headers, data, completed=True) @@ -562,9 +542,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/issues", - None, - None, - post_parameters + input=post_parameters ) return github.Issue.Issue(self._requester, headers, data, completed=True) @@ -584,9 +562,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/keys", - None, - None, - post_parameters + input=post_parameters ) return github.RepositoryKey.RepositoryKey(self._requester, headers, data, completed=True, repoUrl=self._url) @@ -606,9 +582,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/labels", - None, - None, - post_parameters + input=post_parameters ) return github.Label.Label(self._requester, headers, data, completed=True) @@ -637,9 +611,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/milestones", - None, - None, - post_parameters + input=post_parameters ) return github.Milestone.Milestone(self._requester, headers, data, completed=True) @@ -676,9 +648,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/pulls", - None, - None, - post_parameters + input=post_parameters ) return github.PullRequest.PullRequest(self._requester, headers, data, completed=True) @@ -689,10 +659,7 @@ class Repository(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, name, description=github.GithubObject.NotSet, homepage=github.GithubObject.NotSet, public=github.GithubObject.NotSet, has_issues=github.GithubObject.NotSet, has_wiki=github.GithubObject.NotSet, has_downloads=github.GithubObject.NotSet, default_branch=github.GithubObject.NotSet): @@ -736,9 +703,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) @@ -756,10 +721,7 @@ class Repository(github.GithubObject.CompletableGithubObject): url += "/" + ref headers, data = self._requester.requestJsonAndCheck( "GET", - url, - None, - None, - None + url ) return headers["location"] @@ -784,10 +746,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(branch, (str, unicode)), branch headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/branches/" + branch, - None, - None, - None + self.url + "/branches/" + branch ) return github.Branch.Branch(self._requester, headers, data, completed=True) @@ -824,10 +783,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/comments/" + str(id), - None, - None, - None + self.url + "/comments/" + str(id) ) return github.CommitComment.CommitComment(self._requester, headers, data, completed=True) @@ -852,10 +808,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(sha, (str, unicode)), sha headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/commits/" + sha, - None, - None, - None + self.url + "/commits/" + sha ) return github.Commit.Commit(self._requester, headers, data, completed=True) @@ -912,9 +865,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/contents" + path, - url_parameters, - None, - None + parameters=url_parameters ) return github.ContentFile.ContentFile(self._requester, headers, data, completed=True) @@ -933,9 +884,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/contents" + path, - url_parameters, - None, - None + parameters=url_parameters ) # Handle 302 redirect response @@ -943,9 +892,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "GET", headers['location'], - url_parameters, - None, - None + parameters=url_parameters ) return [ @@ -974,10 +921,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/downloads/" + str(id), - None, - None, - None + self.url + "/downloads/" + str(id) ) return github.Download.Download(self._requester, headers, data, completed=True) @@ -1026,10 +970,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(sha, (str, unicode)), sha headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/git/blobs/" + sha, - None, - None, - None + self.url + "/git/blobs/" + sha ) return github.GitBlob.GitBlob(self._requester, headers, data, completed=True) @@ -1042,10 +983,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(sha, (str, unicode)), sha headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/git/commits/" + sha, - None, - None, - None + self.url + "/git/commits/" + sha ) return github.GitCommit.GitCommit(self._requester, headers, data, completed=True) @@ -1061,10 +999,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(ref, (str, unicode)), ref headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + prefix + ref, - None, - None, - None + self.url + prefix + ref ) return github.GitRef.GitRef(self._requester, headers, data, completed=True) @@ -1089,10 +1024,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(sha, (str, unicode)), sha headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/git/tags/" + sha, - None, - None, - None + self.url + "/git/tags/" + sha ) return github.GitTag.GitTag(self._requester, headers, data, completed=True) @@ -1111,9 +1043,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/git/trees/" + sha, - url_parameters, - None, - None + parameters=url_parameters ) return github.GitTree.GitTree(self._requester, headers, data, completed=True) @@ -1126,10 +1056,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/hooks/" + str(id), - None, - None, - None + self.url + "/hooks/" + str(id) ) return github.Hook.Hook(self._requester, headers, data, completed=True) @@ -1154,10 +1081,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(number, (int, long)), number headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/issues/" + str(number), - None, - None, - None + self.url + "/issues/" + str(number) ) return github.Issue.Issue(self._requester, headers, data, completed=True) @@ -1246,10 +1170,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/issues/events/" + str(id), - None, - None, - None + self.url + "/issues/events/" + str(id) ) return github.IssueEvent.IssueEvent(self._requester, headers, data, completed=True) @@ -1274,10 +1195,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(id, (int, long)), id headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/keys/" + str(id), - None, - None, - None + self.url + "/keys/" + str(id) ) return github.RepositoryKey.RepositoryKey(self._requester, headers, data, completed=True, repoUrl=self._url) @@ -1302,10 +1220,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(name, (str, unicode)), name headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/labels/" + urllib.quote(name), - None, - None, - None + self.url + "/labels/" + urllib.quote(name) ) return github.Label.Label(self._requester, headers, data, completed=True) @@ -1328,10 +1243,7 @@ class Repository(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/languages", - None, - None, - None + self.url + "/languages" ) return data @@ -1344,10 +1256,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(number, (int, long)), number headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/milestones/" + str(number), - None, - None, - None + self.url + "/milestones/" + str(number) ) return github.Milestone.Milestone(self._requester, headers, data, completed=True) @@ -1397,10 +1306,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(number, (int, long)), number headers, data = self._requester.requestJsonAndCheck( "GET", - self.url + "/pulls/" + str(number), - None, - None, - None + self.url + "/pulls/" + str(number) ) return github.PullRequest.PullRequest(self._requester, headers, data, completed=True) @@ -1469,9 +1375,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/readme", - url_parameters, - None, - None + parameters=url_parameters ) return github.ContentFile.ContentFile(self._requester, headers, data, completed=True) @@ -1544,10 +1448,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(assignee, github.NamedUser.NamedUser), assignee status, headers, data = self._requester.requestJson( "GET", - self.url + "/assignees/" + assignee._identity, - None, - None, - None + self.url + "/assignees/" + assignee._identity ) return status == 204 @@ -1560,10 +1461,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(collaborator, github.NamedUser.NamedUser), collaborator status, headers, data = self._requester.requestJson( "GET", - self.url + "/collaborators/" + collaborator._identity, - None, - None, - None + self.url + "/collaborators/" + collaborator._identity ) return status == 204 @@ -1578,10 +1476,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(keyword, (str, unicode)), keyword headers, data = self._requester.requestJsonAndCheck( "GET", - "/legacy/issues/search/" + self.owner.login + "/" + self.name + "/" + state + "/" + urllib.quote(keyword), - None, - None, - None + "/legacy/issues/search/" + self.owner.login + "/" + self.name + "/" + state + "/" + urllib.quote(keyword) ) return [ github.Issue.Issue(self._requester, headers, github.Legacy.convertIssue(element), completed=False) @@ -1608,9 +1503,7 @@ class Repository(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/merges", - None, - None, - post_parameters + input=post_parameters ) if data is None: return None @@ -1626,10 +1519,7 @@ class Repository(github.GithubObject.CompletableGithubObject): assert isinstance(collaborator, github.NamedUser.NamedUser), collaborator headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url + "/collaborators/" + collaborator._identity, - None, - None, - None + self.url + "/collaborators/" + collaborator._identity ) def subscribe_to_hub(self, event, callback, secret=github.GithubObject.NotSet): @@ -1669,9 +1559,7 @@ class Repository(github.GithubObject.CompletableGithubObject): responseHeaders, output = self._requester.requestMultipartAndCheck( "POST", "/hub", - None, - None, - post_parameters, + input=post_parameters ) @property diff --git a/github/RepositoryKey.py b/github/RepositoryKey.py index 22b59621..69e1c616 100644 --- a/github/RepositoryKey.py +++ b/github/RepositoryKey.py @@ -89,10 +89,7 @@ class RepositoryKey(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.__customUrl, - None, - None, - None + self.__customUrl ) def edit(self, title=github.GithubObject.NotSet, key=github.GithubObject.NotSet): @@ -112,9 +109,7 @@ class RepositoryKey(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.__customUrl, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) diff --git a/github/Requester.py b/github/Requester.py index bae74618..670d66b6 100644 --- a/github/Requester.py +++ b/github/Requester.py @@ -164,10 +164,10 @@ class Requester: 'See http://developer.github.com/v3/#user-agent-required' self.__userAgent = user_agent - def requestJsonAndCheck(self, verb, url, parameters, headers, input): + def requestJsonAndCheck(self, verb, url, parameters=None, headers=None, input=None): return self.__check(*self.requestJson(verb, url, parameters, headers, input)) - def requestMultipartAndCheck(self, verb, url, parameters, headers, input): + def requestMultipartAndCheck(self, verb, url, parameters=None, headers=None, input=None): return self.__check(*self.requestMultipart(verb, url, parameters, headers, input)) def __check(self, status, responseHeaders, output): @@ -200,13 +200,13 @@ class Requester: except ValueError, e: return {'data': data} - def requestJson(self, verb, url, parameters, headers, input): + def requestJson(self, verb, url, parameters=None, headers=None, input=None): def encode(input): return "application/json", json.dumps(input) return self.__requestEncode(verb, url, parameters, headers, input, encode) - def requestMultipart(self, verb, url, parameters, headers, input): + def requestMultipart(self, verb, url, parameters=None, headers=None, input=None): def encode(input): boundary = "----------------------------3c3ba8b523b2" eol = "\r\n" diff --git a/github/Team.py b/github/Team.py index d8fb7379..9b687d80 100644 --- a/github/Team.py +++ b/github/Team.py @@ -94,10 +94,7 @@ class Team(github.GithubObject.CompletableGithubObject): assert isinstance(member, github.NamedUser.NamedUser), member headers, data = self._requester.requestJsonAndCheck( "PUT", - self.url + "/members/" + member._identity, - None, - None, - None + self.url + "/members/" + member._identity ) def add_to_repos(self, repo): @@ -109,10 +106,7 @@ class Team(github.GithubObject.CompletableGithubObject): assert isinstance(repo, github.Repository.Repository), repo headers, data = self._requester.requestJsonAndCheck( "PUT", - self.url + "/repos/" + repo._identity, - None, - None, - None + self.url + "/repos/" + repo._identity ) def delete(self): @@ -122,10 +116,7 @@ class Team(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, name, permission=github.GithubObject.NotSet): @@ -145,9 +136,7 @@ class Team(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data) @@ -184,10 +173,7 @@ class Team(github.GithubObject.CompletableGithubObject): assert isinstance(member, github.NamedUser.NamedUser), member status, headers, data = self._requester.requestJson( "GET", - self.url + "/members/" + member._identity, - None, - None, - None + self.url + "/members/" + member._identity ) return status == 204 @@ -200,10 +186,7 @@ class Team(github.GithubObject.CompletableGithubObject): assert isinstance(repo, github.Repository.Repository), repo status, headers, data = self._requester.requestJson( "GET", - self.url + "/repos/" + repo._identity, - None, - None, - None + self.url + "/repos/" + repo._identity ) return status == 204 @@ -216,10 +199,7 @@ class Team(github.GithubObject.CompletableGithubObject): assert isinstance(member, github.NamedUser.NamedUser), member headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url + "/members/" + member._identity, - None, - None, - None + self.url + "/members/" + member._identity ) def remove_from_repos(self, repo): @@ -231,10 +211,7 @@ class Team(github.GithubObject.CompletableGithubObject): assert isinstance(repo, github.Repository.Repository), repo headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url + "/repos/" + repo._identity, - None, - None, - None + self.url + "/repos/" + repo._identity ) @property diff --git a/github/UserKey.py b/github/UserKey.py index 83a26009..9ca0133b 100644 --- a/github/UserKey.py +++ b/github/UserKey.py @@ -80,10 +80,7 @@ class UserKey(github.GithubObject.CompletableGithubObject): """ headers, data = self._requester.requestJsonAndCheck( "DELETE", - self.url, - None, - None, - None + self.url ) def edit(self, title=github.GithubObject.NotSet, key=github.GithubObject.NotSet): @@ -103,9 +100,7 @@ class UserKey(github.GithubObject.CompletableGithubObject): headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, - None, - None, - post_parameters + input=post_parameters ) self._useAttributes(data)