Merge branch 'develop' into topic/ExperimentOnDocumentation

Conflicts:
	ReadMe.md
	doc/ChangeLog.md
	doc/ReferenceOfApis.md
	doc/ReferenceOfClasses.md
	github/AuthenticatedUser.py
	github/Authorization.py
	github/CommitComment.py
	github/ContentFile.py
	github/Download.py
	github/Gist.py
	github/GistComment.py
	github/GitRef.py
	github/Github.py
	github/Hook.py
	github/Issue.py
	github/IssueComment.py
	github/Label.py
	github/Milestone.py
	github/PullRequest.py
	github/PullRequestComment.py
	github/Repository.py
	github/RepositoryKey.py
	github/Team.py
	github/UserKey.py
	setup.py
This commit is contained in:
Vincent Jacques
2013-02-16 19:57:13 +01:00
60 changed files with 659 additions and 180 deletions
+2 -2
View File
@@ -74,7 +74,7 @@ class RepositoryKey(github.GithubObject.GithubObject):
:calls: `DELETE /repos/:user/:repo/keys/:id <http://developer.github.com/v3/todo>`_
:rtype: None
"""
headers, data = self._requester.requestAndCheck(
headers, data = self._requester.requestJsonAndCheck(
"DELETE",
self.__customUrl,
None,
@@ -95,7 +95,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,