From e9be8570893b7383c48ee9eead2645aee2d24ddd Mon Sep 17 00:00:00 2001 From: Vincent Jacques Date: Tue, 5 Feb 2013 19:39:03 +0100 Subject: [PATCH] Rename methods in Requester --- github/AuthenticatedUser.py | 48 ++++++++++----------- github/Authorization.py | 4 +- github/Commit.py | 4 +- github/CommitComment.py | 4 +- github/Download.py | 2 +- github/Gist.py | 16 +++---- github/GistComment.py | 4 +- github/GitRef.py | 4 +- github/Github.py | 18 ++++---- github/GithubObject.py | 2 +- github/Hook.py | 6 +-- github/Issue.py | 14 +++--- github/IssueComment.py | 4 +- github/Label.py | 4 +- github/Legacy.py | 2 +- github/Milestone.py | 4 +- github/NamedUser.py | 4 +- github/Organization.py | 22 +++++----- github/PaginatedList.py | 4 +- github/PullRequest.py | 14 +++--- github/PullRequestComment.py | 4 +- github/Repository.py | 84 ++++++++++++++++++------------------ github/RepositoryKey.py | 4 +- github/Requester.py | 14 +++--- github/Team.py | 16 +++---- github/UserKey.py | 4 +- 26 files changed, 155 insertions(+), 155 deletions(-) diff --git a/github/AuthenticatedUser.py b/github/AuthenticatedUser.py index b726900e..9575cab0 100644 --- a/github/AuthenticatedUser.py +++ b/github/AuthenticatedUser.py @@ -156,7 +156,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def add_to_emails(self, *emails): assert all(isinstance(element, (str, unicode)) for element in emails), emails post_parameters = emails - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", "/user/emails", None, @@ -165,7 +165,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def add_to_following(self, following): assert isinstance(following, github.NamedUser.NamedUser), following - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", "/user/following/" + following._identity, None, @@ -174,7 +174,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def add_to_starred(self, starred): assert isinstance(starred, github.Repository.Repository), starred - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", "/user/starred/" + starred._identity, None, @@ -183,7 +183,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def add_to_subscriptions(self, subscription): assert isinstance(subscription, github.Repository.Repository), subscription - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", "/user/subscriptions/" + subscription._identity, None, @@ -192,7 +192,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def add_to_watched(self, watched): assert isinstance(watched, github.Repository.Repository), watched - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", "/user/watched/" + watched._identity, None, @@ -216,7 +216,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): post_parameters["client_id"] = client_id if client_secret is not github.GithubObject.NotSet: post_parameters["client_secret"] = client_secret - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", "/authorizations", None, @@ -226,7 +226,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def create_fork(self, repo): assert isinstance(repo, github.Repository.Repository), repo - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", "/repos/" + repo.owner.login + "/" + repo.name + "/forks", None, @@ -244,7 +244,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): } if description is not github.GithubObject.NotSet: post_parameters["description"] = description - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", "/gists", None, @@ -259,7 +259,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): "title": title, "key": key, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", "/user/keys", None, @@ -296,7 +296,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): post_parameters["auto_init"] = auto_init if gitignore_template is not github.GithubObject.NotSet: post_parameters["gitignore_template"] = gitignore_template - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", "/user/repos", None, @@ -327,7 +327,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): post_parameters["hireable"] = hireable if bio is not github.GithubObject.NotSet: post_parameters["bio"] = bio - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", "/user", None, @@ -337,7 +337,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def get_authorization(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", "/authorizations/" + str(id), None, @@ -354,7 +354,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): ) def get_emails(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", "/user/emails", None, @@ -404,7 +404,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def get_key(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", "/user/keys/" + str(id), None, @@ -439,7 +439,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def get_repo(self, name): assert isinstance(name, (str, unicode)), name - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", "/repos/" + self.login + "/" + name, None, @@ -499,7 +499,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def has_in_following(self, following): assert isinstance(following, github.NamedUser.NamedUser), following - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", "/user/following/" + following._identity, None, @@ -509,7 +509,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def has_in_starred(self, starred): assert isinstance(starred, github.Repository.Repository), starred - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", "/user/starred/" + starred._identity, None, @@ -519,7 +519,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def has_in_subscriptions(self, subscription): assert isinstance(subscription, github.Repository.Repository), subscription - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", "/user/subscriptions/" + subscription._identity, None, @@ -529,7 +529,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def has_in_watched(self, watched): assert isinstance(watched, github.Repository.Repository), watched - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", "/user/watched/" + watched._identity, None, @@ -540,7 +540,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def remove_from_emails(self, *emails): assert all(isinstance(element, (str, unicode)) for element in emails), emails post_parameters = emails - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", "/user/emails", None, @@ -549,7 +549,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def remove_from_following(self, following): assert isinstance(following, github.NamedUser.NamedUser), following - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", "/user/following/" + following._identity, None, @@ -558,7 +558,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def remove_from_starred(self, starred): assert isinstance(starred, github.Repository.Repository), starred - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", "/user/starred/" + starred._identity, None, @@ -567,7 +567,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def remove_from_subscriptions(self, subscription): assert isinstance(subscription, github.Repository.Repository), subscription - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", "/user/subscriptions/" + subscription._identity, None, @@ -576,7 +576,7 @@ class AuthenticatedUser(github.GithubObject.GithubObject): def remove_from_watched(self, watched): assert isinstance(watched, github.Repository.Repository), watched - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", "/user/watched/" + watched._identity, None, diff --git a/github/Authorization.py b/github/Authorization.py index e6876565..39f83d1b 100644 --- a/github/Authorization.py +++ b/github/Authorization.py @@ -65,7 +65,7 @@ class Authorization(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._url) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -89,7 +89,7 @@ class Authorization(github.GithubObject.GithubObject): post_parameters["note"] = note if note_url is not github.GithubObject.NotSet: post_parameters["note_url"] = note_url - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, diff --git a/github/Commit.py b/github/Commit.py index 6998596e..42261fa6 100644 --- a/github/Commit.py +++ b/github/Commit.py @@ -79,7 +79,7 @@ class Commit(github.GithubObject.GithubObject): post_parameters["path"] = path if position is not github.GithubObject.NotSet: post_parameters["position"] = position - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/comments", None, @@ -98,7 +98,7 @@ class Commit(github.GithubObject.GithubObject): post_parameters["target_url"] = target_url if description is not github.GithubObject.NotSet: post_parameters["description"] = description - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self._parentUrl(self._parentUrl(self.url)) + "/statuses/" + self.sha, None, diff --git a/github/CommitComment.py b/github/CommitComment.py index f5d93c72..8b3e3fae 100644 --- a/github/CommitComment.py +++ b/github/CommitComment.py @@ -75,7 +75,7 @@ class CommitComment(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._user) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -87,7 +87,7 @@ class CommitComment(github.GithubObject.GithubObject): post_parameters = { "body": body, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, diff --git a/github/Download.py b/github/Download.py index 6e172a1e..7ff1d829 100644 --- a/github/Download.py +++ b/github/Download.py @@ -118,7 +118,7 @@ class Download(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._url) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, diff --git a/github/Gist.py b/github/Gist.py index cdf7339a..ed42f797 100644 --- a/github/Gist.py +++ b/github/Gist.py @@ -103,7 +103,7 @@ class Gist(github.GithubObject.GithubObject): post_parameters = { "body": body, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/comments", None, @@ -112,7 +112,7 @@ class Gist(github.GithubObject.GithubObject): return github.GistComment.GistComment(self._requester, data, completed=True) def create_fork(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/fork", None, @@ -121,7 +121,7 @@ class Gist(github.GithubObject.GithubObject): return Gist(self._requester, data, completed=True) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -136,7 +136,7 @@ class Gist(github.GithubObject.GithubObject): post_parameters["description"] = description if files is not github.GithubObject.NotSet: post_parameters["files"] = dict((key, value._identity) for key, value in files.iteritems()) - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, @@ -146,7 +146,7 @@ class Gist(github.GithubObject.GithubObject): def get_comment(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/comments/" + str(id), None, @@ -163,7 +163,7 @@ class Gist(github.GithubObject.GithubObject): ) def is_starred(self): - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", self.url + "/star", None, @@ -172,7 +172,7 @@ class Gist(github.GithubObject.GithubObject): return status == 204 def reset_starred(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url + "/star", None, @@ -180,7 +180,7 @@ class Gist(github.GithubObject.GithubObject): ) def set_starred(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", self.url + "/star", None, diff --git a/github/GistComment.py b/github/GistComment.py index 1d0a573c..51ed5aa5 100644 --- a/github/GistComment.py +++ b/github/GistComment.py @@ -50,7 +50,7 @@ class GistComment(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._user) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -62,7 +62,7 @@ class GistComment(github.GithubObject.GithubObject): post_parameters = { "body": body, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, diff --git a/github/GitRef.py b/github/GitRef.py index ce6a0904..292daafb 100644 --- a/github/GitRef.py +++ b/github/GitRef.py @@ -35,7 +35,7 @@ class GitRef(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._url) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -50,7 +50,7 @@ class GitRef(github.GithubObject.GithubObject): } if force is not github.GithubObject.NotSet: post_parameters["force"] = force - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, diff --git a/github/Github.py b/github/Github.py index 1a38ee7b..1ec0f043 100644 --- a/github/Github.py +++ b/github/Github.py @@ -53,7 +53,7 @@ class Github(object): if login is github.GithubObject.NotSet: return AuthenticatedUser.AuthenticatedUser(self.__requester, {"url": "/user"}, completed=False) else: - headers, data = self.__requester.requestAndCheck( + headers, data = self.__requester.requestJsonAndCheck( "GET", "/users/" + login, None, @@ -63,7 +63,7 @@ class Github(object): def get_organization(self, login): assert isinstance(login, (str, unicode)), login - headers, data = self.__requester.requestAndCheck( + headers, data = self.__requester.requestJsonAndCheck( "GET", "/orgs/" + login, None, @@ -73,7 +73,7 @@ class Github(object): def get_repo(self, full_name): assert isinstance(full_name, (str, unicode)), full_name - headers, data = self.__requester.requestAndCheck( + headers, data = self.__requester.requestJsonAndCheck( "GET", "/repos/" + full_name, None, @@ -83,7 +83,7 @@ class Github(object): def get_gist(self, id): assert isinstance(id, (str, unicode)), id - headers, data = self.__requester.requestAndCheck( + headers, data = self.__requester.requestJsonAndCheck( "GET", "/gists/" + id, None, @@ -125,7 +125,7 @@ class Github(object): def legacy_search_user_by_email(self, email): assert isinstance(email, (str, unicode)), email - headers, data = self.__requester.requestAndCheck( + headers, data = self.__requester.requestJsonAndCheck( "GET", "/legacy/user/email/" + email, None, @@ -142,7 +142,7 @@ class Github(object): if context is not github.GithubObject.NotSet: post_parameters["mode"] = "gfm" post_parameters["context"] = context._identity - status, headers, data = self.__requester.requestRaw( + status, headers, data = self.__requester.requestJson( "POST", "/markdown", None, @@ -151,7 +151,7 @@ class Github(object): return data def get_hooks(self): - headers, data = self.__requester.requestAndCheck( + headers, data = self.__requester.requestJsonAndCheck( "GET", "/hooks", None, @@ -160,7 +160,7 @@ class Github(object): return [HookDescription.HookDescription(self.__requester, attributes, completed=True) for attributes in data] def get_gitignore_templates(self): - headers, data = self.__requester.requestAndCheck( + headers, data = self.__requester.requestJsonAndCheck( "GET", "/gitignore/templates", None, @@ -170,7 +170,7 @@ class Github(object): def get_gitignore_template(self, name): assert isinstance(name, (str, unicode)), name - headers, attributes = self.__requester.requestAndCheck( + headers, attributes = self.__requester.requestJsonAndCheck( "GET", "/gitignore/templates/" + name, None, diff --git a/github/GithubObject.py b/github/GithubObject.py index 76e3c4b8..d2929c6d 100644 --- a/github/GithubObject.py +++ b/github/GithubObject.py @@ -62,7 +62,7 @@ class GithubObject(BasicGithubObject): self.__complete() def __complete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self._url, None, diff --git a/github/Hook.py b/github/Hook.py index a1faccb1..56715266 100644 --- a/github/Hook.py +++ b/github/Hook.py @@ -65,7 +65,7 @@ class Hook(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._url) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -91,7 +91,7 @@ class Hook(github.GithubObject.GithubObject): post_parameters["remove_events"] = remove_events if active is not github.GithubObject.NotSet: post_parameters["active"] = active - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, @@ -100,7 +100,7 @@ class Hook(github.GithubObject.GithubObject): self._useAttributes(data) def test(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/test", None, diff --git a/github/Issue.py b/github/Issue.py index c502f30e..66701716 100644 --- a/github/Issue.py +++ b/github/Issue.py @@ -119,7 +119,7 @@ class Issue(github.GithubObject.GithubObject): def add_to_labels(self, *labels): assert all(isinstance(element, github.Label.Label) for element in labels), labels post_parameters = [label.name for label in labels] - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/labels", None, @@ -131,7 +131,7 @@ class Issue(github.GithubObject.GithubObject): post_parameters = { "body": body, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/comments", None, @@ -140,7 +140,7 @@ class Issue(github.GithubObject.GithubObject): return github.IssueComment.IssueComment(self._requester, data, completed=True) def delete_labels(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url + "/labels", None, @@ -167,7 +167,7 @@ class Issue(github.GithubObject.GithubObject): post_parameters["milestone"] = milestone._identity if milestone else '' if labels is not github.GithubObject.NotSet: post_parameters["labels"] = labels - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, @@ -177,7 +177,7 @@ class Issue(github.GithubObject.GithubObject): def get_comment(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self._parentUrl(self.url) + "/comments/" + str(id), None, @@ -211,7 +211,7 @@ class Issue(github.GithubObject.GithubObject): def remove_from_labels(self, label): assert isinstance(label, github.Label.Label), label - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url + "/labels/" + label._identity, None, @@ -221,7 +221,7 @@ class Issue(github.GithubObject.GithubObject): def set_labels(self, *labels): assert all(isinstance(element, github.Label.Label) for element in labels), labels post_parameters = [label.name for label in labels] - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", self.url + "/labels", None, diff --git a/github/IssueComment.py b/github/IssueComment.py index aab643a4..022deef8 100644 --- a/github/IssueComment.py +++ b/github/IssueComment.py @@ -50,7 +50,7 @@ class IssueComment(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._user) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -62,7 +62,7 @@ class IssueComment(github.GithubObject.GithubObject): post_parameters = { "body": body, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, diff --git a/github/Label.py b/github/Label.py index 5e5410ee..2fddabc4 100644 --- a/github/Label.py +++ b/github/Label.py @@ -35,7 +35,7 @@ class Label(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._url) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -49,7 +49,7 @@ class Label(github.GithubObject.GithubObject): "name": name, "color": color, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, diff --git a/github/Legacy.py b/github/Legacy.py index f9567610..1ed52b6a 100644 --- a/github/Legacy.py +++ b/github/Legacy.py @@ -43,7 +43,7 @@ class PaginatedList(github.PaginatedList.PaginatedListBase): args = dict(self.__args) if page != 0: args["start_page"] = page + 1 - headers, data = self.__requester.requestAndCheck( + headers, data = self.__requester.requestJsonAndCheck( "GET", self.__url, args, diff --git a/github/Milestone.py b/github/Milestone.py index e646a225..d2d8b3c5 100644 --- a/github/Milestone.py +++ b/github/Milestone.py @@ -79,7 +79,7 @@ class Milestone(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._url) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -100,7 +100,7 @@ class Milestone(github.GithubObject.GithubObject): post_parameters["description"] = description if due_on is not github.GithubObject.NotSet: post_parameters["due_on"] = due_on.strftime("%Y-%m-%d") - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, diff --git a/github/NamedUser.py b/github/NamedUser.py index 87e6c0f5..1afbcf52 100644 --- a/github/NamedUser.py +++ b/github/NamedUser.py @@ -165,7 +165,7 @@ class NamedUser(github.GithubObject.GithubObject): } if description is not github.GithubObject.NotSet: post_parameters["description"] = description - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/gists", None, @@ -247,7 +247,7 @@ class NamedUser(github.GithubObject.GithubObject): def get_repo(self, name): assert isinstance(name, (str, unicode)), name - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", "/repos/" + self.login + "/" + name, None, diff --git a/github/Organization.py b/github/Organization.py index c6aadb54..6f7b8e1b 100644 --- a/github/Organization.py +++ b/github/Organization.py @@ -146,7 +146,7 @@ class Organization(github.GithubObject.GithubObject): def add_to_public_members(self, public_member): assert isinstance(public_member, github.NamedUser.NamedUser), public_member - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", self.url + "/public_members/" + public_member._identity, None, @@ -158,7 +158,7 @@ class Organization(github.GithubObject.GithubObject): url_parameters = { "org": self.login, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", "/repos/" + repo.owner.login + "/" + repo.name + "/forks", url_parameters, @@ -198,7 +198,7 @@ class Organization(github.GithubObject.GithubObject): post_parameters["auto_init"] = auto_init if gitignore_template is not github.GithubObject.NotSet: post_parameters["gitignore_template"] = gitignore_template - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/repos", None, @@ -217,7 +217,7 @@ class Organization(github.GithubObject.GithubObject): post_parameters["repo_names"] = [element._identity for element in repo_names] if permission is not github.GithubObject.NotSet: post_parameters["permission"] = permission - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/teams", None, @@ -245,7 +245,7 @@ class Organization(github.GithubObject.GithubObject): post_parameters["location"] = location if name is not github.GithubObject.NotSet: post_parameters["name"] = name - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, @@ -279,7 +279,7 @@ class Organization(github.GithubObject.GithubObject): def get_repo(self, name): assert isinstance(name, (str, unicode)), name - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", "/repos/" + self.login + "/" + name, None, @@ -301,7 +301,7 @@ class Organization(github.GithubObject.GithubObject): def get_team(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", "/teams/" + str(id), None, @@ -319,7 +319,7 @@ class Organization(github.GithubObject.GithubObject): def has_in_members(self, member): assert isinstance(member, github.NamedUser.NamedUser), member - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", self.url + "/members/" + member._identity, None, @@ -329,7 +329,7 @@ class Organization(github.GithubObject.GithubObject): def has_in_public_members(self, public_member): assert isinstance(public_member, github.NamedUser.NamedUser), public_member - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", self.url + "/public_members/" + public_member._identity, None, @@ -339,7 +339,7 @@ class Organization(github.GithubObject.GithubObject): def remove_from_members(self, member): assert isinstance(member, github.NamedUser.NamedUser), member - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url + "/members/" + member._identity, None, @@ -348,7 +348,7 @@ class Organization(github.GithubObject.GithubObject): def remove_from_public_members(self, public_member): assert isinstance(public_member, github.NamedUser.NamedUser), public_member - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url + "/public_members/" + public_member._identity, None, diff --git a/github/PaginatedList.py b/github/PaginatedList.py index 117f7947..64d0acf3 100644 --- a/github/PaginatedList.py +++ b/github/PaginatedList.py @@ -82,7 +82,7 @@ class PaginatedList(PaginatedListBase): return self.__nextUrl is not None def _fetchNextPage(self): - headers, data = self.__requester.requestAndCheck("GET", self.__nextUrl, self.__nextParams, None) + headers, data = self.__requester.requestJsonAndCheck("GET", self.__nextUrl, self.__nextParams, None) links = self.__parseLinkHeader(headers) if len(data) > 0 and "next" in links: @@ -111,7 +111,7 @@ class PaginatedList(PaginatedListBase): params = dict(self.__firstParams) if page != 0: params["page"] = page + 1 - headers, data = self.__requester.requestAndCheck("GET", self.__firstUrl, params, None) + headers, data = self.__requester.requestJsonAndCheck("GET", self.__firstUrl, params, None) return [ self.__contentClass(self.__requester, element, completed=False) diff --git a/github/PullRequest.py b/github/PullRequest.py index 0799aa64..44c41298 100644 --- a/github/PullRequest.py +++ b/github/PullRequest.py @@ -175,7 +175,7 @@ class PullRequest(github.GithubObject.GithubObject): "path": path, "position": position, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/comments", None, @@ -188,7 +188,7 @@ class PullRequest(github.GithubObject.GithubObject): post_parameters = { "body": body, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self._parentUrl(self._parentUrl(self.url)) + "/issues/" + str(self.number) + "/comments", None, @@ -207,7 +207,7 @@ class PullRequest(github.GithubObject.GithubObject): post_parameters["body"] = body if state is not github.GithubObject.NotSet: post_parameters["state"] = state - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, @@ -220,7 +220,7 @@ class PullRequest(github.GithubObject.GithubObject): def get_review_comment(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self._parentUrl(self.url) + "/comments/" + str(id), None, @@ -257,7 +257,7 @@ class PullRequest(github.GithubObject.GithubObject): def get_issue_comment(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self._parentUrl(self._parentUrl(self.url)) + "/issues/comments/" + str(id), None, @@ -274,7 +274,7 @@ class PullRequest(github.GithubObject.GithubObject): ) def is_merged(self): - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", self.url + "/merge", None, @@ -287,7 +287,7 @@ class PullRequest(github.GithubObject.GithubObject): post_parameters = dict() if commit_message is not github.GithubObject.NotSet: post_parameters["commit_message"] = commit_message - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", self.url + "/merge", None, diff --git a/github/PullRequestComment.py b/github/PullRequestComment.py index dbbb95b7..26d28a87 100644 --- a/github/PullRequestComment.py +++ b/github/PullRequestComment.py @@ -75,7 +75,7 @@ class PullRequestComment(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._user) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -87,7 +87,7 @@ class PullRequestComment(github.GithubObject.GithubObject): post_parameters = { "body": body, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, diff --git a/github/Repository.py b/github/Repository.py index 964ac3a2..fca9d8f2 100644 --- a/github/Repository.py +++ b/github/Repository.py @@ -200,7 +200,7 @@ class Repository(github.GithubObject.GithubObject): def add_to_collaborators(self, collaborator): assert isinstance(collaborator, github.NamedUser.NamedUser), collaborator - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", self.url + "/collaborators/" + collaborator._identity, None, @@ -210,7 +210,7 @@ class Repository(github.GithubObject.GithubObject): def compare(self, base, head): assert isinstance(base, (str, unicode)), base assert isinstance(head, (str, unicode)), head - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/compare/" + base + "..." + head, None, @@ -231,7 +231,7 @@ class Repository(github.GithubObject.GithubObject): post_parameters["description"] = description if content_type is not github.GithubObject.NotSet: post_parameters["content_type"] = content_type - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/downloads", None, @@ -246,7 +246,7 @@ class Repository(github.GithubObject.GithubObject): "content": content, "encoding": encoding, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/blobs", None, @@ -269,7 +269,7 @@ class Repository(github.GithubObject.GithubObject): post_parameters["author"] = author._identity if committer is not github.GithubObject.NotSet: post_parameters["committer"] = committer._identity - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/commits", None, @@ -284,7 +284,7 @@ class Repository(github.GithubObject.GithubObject): "ref": ref, "sha": sha, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/refs", None, @@ -306,7 +306,7 @@ class Repository(github.GithubObject.GithubObject): } if tagger is not github.GithubObject.NotSet: post_parameters["tagger"] = tagger._identity - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/tags", None, @@ -322,7 +322,7 @@ class Repository(github.GithubObject.GithubObject): } if base_tree is not github.GithubObject.NotSet: post_parameters["base_tree"] = base_tree._identity - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/git/trees", None, @@ -343,7 +343,7 @@ class Repository(github.GithubObject.GithubObject): post_parameters["events"] = events if active is not github.GithubObject.NotSet: post_parameters["active"] = active - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/hooks", None, @@ -368,7 +368,7 @@ class Repository(github.GithubObject.GithubObject): post_parameters["milestone"] = milestone._identity if labels is not github.GithubObject.NotSet: post_parameters["labels"] = [element.name for element in labels] - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/issues", None, @@ -383,7 +383,7 @@ class Repository(github.GithubObject.GithubObject): "title": title, "key": key, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/keys", None, @@ -398,7 +398,7 @@ class Repository(github.GithubObject.GithubObject): "name": name, "color": color, } - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/labels", None, @@ -420,7 +420,7 @@ class Repository(github.GithubObject.GithubObject): post_parameters["description"] = description if due_on is not github.GithubObject.NotSet: post_parameters["due_on"] = due_on.strftime("%Y-%m-%d") - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/milestones", None, @@ -449,7 +449,7 @@ class Repository(github.GithubObject.GithubObject): def __create_pull(self, **kwds): post_parameters = kwds - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/pulls", None, @@ -458,7 +458,7 @@ class Repository(github.GithubObject.GithubObject): return github.PullRequest.PullRequest(self._requester, data, completed=True) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -491,7 +491,7 @@ class Repository(github.GithubObject.GithubObject): post_parameters["has_downloads"] = has_downloads if default_branch is not github.GithubObject.NotSet: post_parameters["default_branch"] = default_branch - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, @@ -505,7 +505,7 @@ class Repository(github.GithubObject.GithubObject): url = self.url + "/" + archive_format if ref is not github.GithubObject.NotSet: url += "/" + ref - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", url, None, @@ -523,7 +523,7 @@ class Repository(github.GithubObject.GithubObject): def get_branch(self, branch): assert isinstance(branch, (str, unicode)), branch - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/branches/" + branch, None, @@ -549,7 +549,7 @@ class Repository(github.GithubObject.GithubObject): def get_comment(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/comments/" + str(id), None, @@ -567,7 +567,7 @@ class Repository(github.GithubObject.GithubObject): def get_commit(self, sha): assert isinstance(sha, (str, unicode)), sha - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/commits/" + sha, None, @@ -596,7 +596,7 @@ class Repository(github.GithubObject.GithubObject): url_parameters = dict() if ref is not github.GithubObject.NotSet: url_parameters["ref"] = ref - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/contents" + path, url_parameters, @@ -614,7 +614,7 @@ class Repository(github.GithubObject.GithubObject): def get_download(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/downloads/" + str(id), None, @@ -648,7 +648,7 @@ class Repository(github.GithubObject.GithubObject): def get_git_blob(self, sha): assert isinstance(sha, (str, unicode)), sha - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/git/blobs/" + sha, None, @@ -658,7 +658,7 @@ class Repository(github.GithubObject.GithubObject): def get_git_commit(self, sha): assert isinstance(sha, (str, unicode)), sha - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/git/commits/" + sha, None, @@ -671,7 +671,7 @@ class Repository(github.GithubObject.GithubObject): if not self._requester.FIX_REPO_GET_GIT_REF: prefix = "/git/" assert isinstance(ref, (str, unicode)), ref - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + prefix + ref, None, @@ -689,7 +689,7 @@ class Repository(github.GithubObject.GithubObject): def get_git_tag(self, sha): assert isinstance(sha, (str, unicode)), sha - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/git/tags/" + sha, None, @@ -703,7 +703,7 @@ class Repository(github.GithubObject.GithubObject): url_parameters = dict() if recursive is not github.GithubObject.NotSet: url_parameters["recursive"] = recursive - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/git/trees/" + sha, url_parameters, @@ -713,7 +713,7 @@ class Repository(github.GithubObject.GithubObject): def get_hook(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/hooks/" + str(id), None, @@ -731,7 +731,7 @@ class Repository(github.GithubObject.GithubObject): def get_issue(self, number): assert isinstance(number, (int, long)), number - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/issues/" + str(number), None, @@ -798,7 +798,7 @@ class Repository(github.GithubObject.GithubObject): def get_issues_event(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/issues/events/" + str(id), None, @@ -816,7 +816,7 @@ class Repository(github.GithubObject.GithubObject): def get_key(self, id): assert isinstance(id, (int, long)), id - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/keys/" + str(id), None, @@ -834,7 +834,7 @@ class Repository(github.GithubObject.GithubObject): def get_label(self, name): assert isinstance(name, (str, unicode)), name - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/labels/" + urllib.quote(name), None, @@ -851,7 +851,7 @@ class Repository(github.GithubObject.GithubObject): ) def get_languages(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/languages", None, @@ -861,7 +861,7 @@ class Repository(github.GithubObject.GithubObject): def get_milestone(self, number): assert isinstance(number, (int, long)), number - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/milestones/" + str(number), None, @@ -897,7 +897,7 @@ class Repository(github.GithubObject.GithubObject): def get_pull(self, number): assert isinstance(number, (int, long)), number - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/pulls/" + str(number), None, @@ -943,7 +943,7 @@ class Repository(github.GithubObject.GithubObject): url_parameters = dict() if ref is not github.GithubObject.NotSet: url_parameters["ref"] = ref - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", self.url + "/readme", url_parameters, @@ -993,7 +993,7 @@ class Repository(github.GithubObject.GithubObject): def has_in_assignees(self, assignee): assert isinstance(assignee, github.NamedUser.NamedUser), assignee - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", self.url + "/assignees/" + assignee._identity, None, @@ -1003,7 +1003,7 @@ class Repository(github.GithubObject.GithubObject): def has_in_collaborators(self, collaborator): assert isinstance(collaborator, github.NamedUser.NamedUser), collaborator - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", self.url + "/collaborators/" + collaborator._identity, None, @@ -1014,7 +1014,7 @@ class Repository(github.GithubObject.GithubObject): def legacy_search_issues(self, state, keyword): assert state in ["open", "closed"], state assert isinstance(keyword, (str, unicode)), keyword - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "GET", "/legacy/issues/search/" + self.owner.login + "/" + self.name + "/" + state + "/" + urllib.quote(keyword), None, @@ -1035,7 +1035,7 @@ class Repository(github.GithubObject.GithubObject): } if commit_message is not github.GithubObject.NotSet: post_parameters["commit_message"] = commit_message - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "POST", self.url + "/merges", None, @@ -1048,7 +1048,7 @@ class Repository(github.GithubObject.GithubObject): def remove_from_collaborators(self, collaborator): assert isinstance(collaborator, github.NamedUser.NamedUser), collaborator - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url + "/collaborators/" + collaborator._identity, None, @@ -1092,7 +1092,7 @@ class Repository(github.GithubObject.GithubObject): "Content-Length": len(input), } - responseHeaders, output = self._requester.requestAndCheckReallyRaw( + responseHeaders, output = self._requester.requestRawAndCheck( "POST", "/hub", requestHeaders, diff --git a/github/RepositoryKey.py b/github/RepositoryKey.py index 028dc3ce..5d41d117 100644 --- a/github/RepositoryKey.py +++ b/github/RepositoryKey.py @@ -51,7 +51,7 @@ class RepositoryKey(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._verified) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.__customUrl, None, @@ -66,7 +66,7 @@ class RepositoryKey(github.GithubObject.GithubObject): post_parameters["title"] = title if key is not github.GithubObject.NotSet: post_parameters["key"] = key - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.__customUrl, None, diff --git a/github/Requester.py b/github/Requester.py index 6b102148..60951cb5 100644 --- a/github/Requester.py +++ b/github/Requester.py @@ -73,8 +73,8 @@ class Requester: self.__clientSecret = client_secret self.__userAgent = user_agent - def requestAndCheck(self, verb, url, parameters, input): - status, headers, output = self.requestRaw(verb, url, parameters, input) + def requestJsonAndCheck(self, verb, url, parameters, input): + status, headers, output = self.requestJson(verb, url, parameters, input) output = self.__structuredFromJson(output) if status >= 400: raise GithubException.GithubException(status, output) @@ -86,7 +86,7 @@ class Requester: else: return json.loads(data) - def requestRaw(self, verb, url, parameters, input): + def requestJson(self, verb, url, parameters, input): assert verb in ["HEAD", "GET", "POST", "PATCH", "PUT", "DELETE"] if parameters is None: parameters = dict() @@ -102,21 +102,21 @@ class Requester: if input is not None: requestHeaders["Content-Type"] = "application/json" - status, responseHeaders, output = self.requestReallyRaw(verb, url, requestHeaders, json.dumps(input)) + status, responseHeaders, output = self.requestRaw(verb, url, requestHeaders, json.dumps(input)) if "x-ratelimit-remaining" in responseHeaders and "x-ratelimit-limit" in responseHeaders: self.rate_limiting = (int(responseHeaders["x-ratelimit-remaining"]), int(responseHeaders["x-ratelimit-limit"])) return status, responseHeaders, output - def requestAndCheckReallyRaw(self, verb, url, requestHeaders, input): - status, headers, output = self.requestReallyRaw(verb, url, requestHeaders, input) + def requestRawAndCheck(self, verb, url, requestHeaders, input): + status, headers, output = self.requestRaw(verb, url, requestHeaders, input) output = self.__structuredFromJson(output) if status >= 400: raise GithubException.GithubException(status, output) return headers, output - def requestReallyRaw(self, verb, url, requestHeaders, input): + def requestRaw(self, verb, url, requestHeaders, input): cnx = self.__createConnection() cnx.request( verb, diff --git a/github/Team.py b/github/Team.py index 684e5df9..08f82181 100644 --- a/github/Team.py +++ b/github/Team.py @@ -53,7 +53,7 @@ class Team(github.GithubObject.GithubObject): def add_to_members(self, member): assert isinstance(member, github.NamedUser.NamedUser), member - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", self.url + "/members/" + member._identity, None, @@ -62,7 +62,7 @@ class Team(github.GithubObject.GithubObject): def add_to_repos(self, repo): assert isinstance(repo, github.Repository.Repository), repo - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PUT", self.url + "/repos/" + repo._identity, None, @@ -70,7 +70,7 @@ class Team(github.GithubObject.GithubObject): ) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -85,7 +85,7 @@ class Team(github.GithubObject.GithubObject): } if permission is not github.GithubObject.NotSet: post_parameters["permission"] = permission - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None, @@ -111,7 +111,7 @@ class Team(github.GithubObject.GithubObject): def has_in_members(self, member): assert isinstance(member, github.NamedUser.NamedUser), member - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", self.url + "/members/" + member._identity, None, @@ -121,7 +121,7 @@ class Team(github.GithubObject.GithubObject): def has_in_repos(self, repo): assert isinstance(repo, github.Repository.Repository), repo - status, headers, data = self._requester.requestRaw( + status, headers, data = self._requester.requestJson( "GET", self.url + "/repos/" + repo._identity, None, @@ -131,7 +131,7 @@ class Team(github.GithubObject.GithubObject): def remove_from_members(self, member): assert isinstance(member, github.NamedUser.NamedUser), member - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url + "/members/" + member._identity, None, @@ -140,7 +140,7 @@ class Team(github.GithubObject.GithubObject): def remove_from_repos(self, repo): assert isinstance(repo, github.Repository.Repository), repo - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url + "/repos/" + repo._identity, None, diff --git a/github/UserKey.py b/github/UserKey.py index 4fe342ce..790fc3a6 100644 --- a/github/UserKey.py +++ b/github/UserKey.py @@ -43,7 +43,7 @@ class UserKey(github.GithubObject.GithubObject): return self._NoneIfNotSet(self._verified) def delete(self): - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "DELETE", self.url, None, @@ -58,7 +58,7 @@ class UserKey(github.GithubObject.GithubObject): post_parameters["title"] = title if key is not github.GithubObject.NotSet: post_parameters["key"] = key - headers, data = self._requester.requestAndCheck( + headers, data = self._requester.requestJsonAndCheck( "PATCH", self.url, None,