From eaa1bbe26867f6c10de25cedcc97f23fda2394a3 Mon Sep 17 00:00:00 2001 From: Vincent Jacques Date: Tue, 29 May 2012 18:10:12 +0200 Subject: [PATCH] Revert "Remove one argument of Requester.request" We will need it soon for all url parameters not yet used This reverts commit 9fa4e8ff5e899d1ab0dc927c9213660b7c1c5908. Conflicts: codegen/templates/GithubObject.MethodBody.DoRequest.py src/github/Organization.py --- .../description.000.human_readable.json | 6 ++- .../description.001.normalized.json | 19 ++++--- .../GithubObject.MethodBody.DoRequest.py | 13 +++++ codegen/templates/GithubObject.py | 1 + src/github/AuthenticatedUser.py | 31 +++++++++++ src/github/Authorization.py | 3 ++ src/github/Commit.py | 3 ++ src/github/CommitComment.py | 3 ++ src/github/Download.py | 2 + src/github/Gist.py | 10 ++++ src/github/GistComment.py | 2 + src/github/GitRef.py | 2 + src/github/Github.py | 2 +- src/github/Hook.py | 3 ++ src/github/Issue.py | 11 ++++ src/github/IssueComment.py | 2 + src/github/IssueEvent.py | 1 + src/github/Label.py | 2 + src/github/Milestone.py | 3 ++ src/github/NamedUser.py | 13 +++++ src/github/Organization.py | 22 +++++++- src/github/PaginatedList.py | 2 +- src/github/PullRequest.py | 9 ++++ src/github/PullRequestComment.py | 3 ++ src/github/Repository.py | 54 +++++++++++++++++++ src/github/RepositoryKey.py | 3 ++ src/github/Requester.py | 12 +++-- src/github/Team.py | 11 ++++ src/github/UserKey.py | 3 ++ 29 files changed, 237 insertions(+), 14 deletions(-) diff --git a/codegen/JsonDescriptionOfGithubApiV3/description.000.human_readable.json b/codegen/JsonDescriptionOfGithubApiV3/description.000.human_readable.json index 3794441f..cfc6838d 100644 --- a/codegen/JsonDescriptionOfGithubApiV3/description.000.human_readable.json +++ b/codegen/JsonDescriptionOfGithubApiV3/description.000.human_readable.json @@ -1087,8 +1087,10 @@ { "type": "argument", "value": [ "repo", "owner", "login" ] }, { "type": "constant", "value": "/" }, { "type": "argument", "value": [ "repo", "name" ] }, - { "type": "constant", "value": "/forks?org=" }, - { "type": "attribute", "value": [ "login" ] } + { "type": "constant", "value": "/forks" } + ], + "url_parameters": [ + { "name": "org", "value": [ { "type": "attribute", "value": [ "login" ] } ] } ], "information": "status" } diff --git a/codegen/JsonDescriptionOfGithubApiV3/description.001.normalized.json b/codegen/JsonDescriptionOfGithubApiV3/description.001.normalized.json index afcd2fb9..c22c6225 100644 --- a/codegen/JsonDescriptionOfGithubApiV3/description.001.normalized.json +++ b/codegen/JsonDescriptionOfGithubApiV3/description.001.normalized.json @@ -6340,17 +6340,24 @@ }, { "type": "constant", - "value": "/forks?org=" - }, + "value": "/forks" + } + ], + "url_parameters": [ { - "type": "attribute", + "name": "org", "value": [ - "login" + { + "type": "attribute", + "value": [ + "login" + ] + } ] } ], - "information": "status", - "verb": "POST" + "verb": "POST", + "information": "status" }, "isMutation": false, "optionalParameters": [], diff --git a/codegen/templates/GithubObject.MethodBody.DoRequest.py b/codegen/templates/GithubObject.MethodBody.DoRequest.py index dd57f8ae..a1efdd4f 100644 --- a/codegen/templates/GithubObject.MethodBody.DoRequest.py +++ b/codegen/templates/GithubObject.MethodBody.DoRequest.py @@ -111,9 +111,22 @@ {% endif %} {% endif %} +{% if method.request.url_parameters %} + url_parameters = { + {% for parameter in method.request.url_parameters %} + "{{ parameter.name }}": {% include "GithubObject.Concatenation.py" with concatenation=parameter.value only %}, + {% endfor %} + } +{% endif %} + status, headers, data = self.__requester.request( "{{ method.request.verb }}", {% include "GithubObject.Concatenation.py" with concatenation=method.request.url only %}, +{% if method.request.url_parameters %} + url_parameters, +{% else %} + None, +{% endif %} {% if method.request.postParameters %} post_parameters {% else %} diff --git a/codegen/templates/GithubObject.py b/codegen/templates/GithubObject.py index 327e5f5c..9bc9090b 100644 --- a/codegen/templates/GithubObject.py +++ b/codegen/templates/GithubObject.py @@ -59,6 +59,7 @@ class {{ class.name }}( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/AuthenticatedUser.py b/src/github/AuthenticatedUser.py index 9b453466..456e1afb 100644 --- a/src/github/AuthenticatedUser.py +++ b/src/github/AuthenticatedUser.py @@ -153,6 +153,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/user" + "/emails", + None, post_parameters ) @@ -161,6 +162,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "PUT", "https://api.github.com/user" + "/following" + "/" + str( following._identity ), + None, None ) @@ -169,6 +171,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "PUT", "https://api.github.com/user" + "/watched" + "/" + str( watched._identity ), + None, None ) @@ -190,6 +193,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/authorizations", + None, post_parameters ) return Authorization.Authorization( self.__requester, data, completion = NoCompletion ) @@ -199,6 +203,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/repos/" + str( repo.owner.login ) + "/" + str( repo.name ) + "/forks", + None, None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -216,6 +221,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/gists", + None, post_parameters ) return Gist.Gist( self.__requester, data, completion = NoCompletion ) @@ -230,6 +236,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/user/keys", + None, post_parameters ) return UserKey.UserKey( self.__requester, data, completion = NoCompletion ) @@ -266,6 +273,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "POST", "https://api.github.com/user" + "/repos", + None, post_parameters ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -304,6 +312,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "PATCH", "https://api.github.com/user", + None, post_parameters ) self.__useAttributes( data ) @@ -313,6 +322,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/authorizations" + "/" + str( id ), + None, None ) return Authorization.Authorization( self.__requester, data, completion = NoCompletion ) @@ -321,6 +331,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/authorizations", + None, None ) return PaginatedList.PaginatedList( @@ -334,6 +345,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/emails", + None, None ) return data @@ -342,6 +354,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/events", + None, None ) return PaginatedList.PaginatedList( @@ -355,6 +368,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/followers", + None, None ) return PaginatedList.PaginatedList( @@ -368,6 +382,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/following", + None, None ) return PaginatedList.PaginatedList( @@ -381,6 +396,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists", + None, None ) return PaginatedList.PaginatedList( @@ -394,6 +410,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/issues", + None, None ) return PaginatedList.PaginatedList( @@ -408,6 +425,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user/keys" + "/" + str( id ), + None, None ) return UserKey.UserKey( self.__requester, data, completion = NoCompletion ) @@ -416,6 +434,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user/keys", + None, None ) return PaginatedList.PaginatedList( @@ -430,6 +449,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/users/" + str( self.login ) + "/events/orgs/" + str( org.login ), + None, None ) return PaginatedList.PaginatedList( @@ -443,6 +463,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/orgs", + None, None ) return PaginatedList.PaginatedList( @@ -457,6 +478,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/repos/" + str( self.login ) + "/" + str( name ), + None, None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -467,6 +489,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/repos", + None, None ) return PaginatedList.PaginatedList( @@ -480,6 +503,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists/starred", + None, None ) return PaginatedList.PaginatedList( @@ -493,6 +517,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/watched", + None, None ) return PaginatedList.PaginatedList( @@ -507,6 +532,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/following" + "/" + str( following._identity ), + None, None ) return status == 204 @@ -516,6 +542,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/user" + "/watched" + "/" + str( watched._identity ), + None, None ) return status == 204 @@ -526,6 +553,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "DELETE", "https://api.github.com/user" + "/emails", + None, post_parameters ) @@ -534,6 +562,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "DELETE", "https://api.github.com/user" + "/following" + "/" + str( following._identity ), + None, None ) @@ -542,6 +571,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "DELETE", "https://api.github.com/user" + "/watched" + "/" + str( watched._identity ), + None, None ) @@ -580,6 +610,7 @@ class AuthenticatedUser( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/Authorization.py b/src/github/Authorization.py index 56eadacd..1f482e5b 100644 --- a/src/github/Authorization.py +++ b/src/github/Authorization.py @@ -62,6 +62,7 @@ class Authorization( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -91,6 +92,7 @@ class Authorization( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -114,6 +116,7 @@ class Authorization( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/Commit.py b/src/github/Commit.py index 01fcac52..7269ce6f 100644 --- a/src/github/Commit.py +++ b/src/github/Commit.py @@ -79,6 +79,7 @@ class Commit( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/comments", + None, post_parameters ) return CommitComment.CommitComment( self.__requester, data, completion = NoCompletion ) @@ -87,6 +88,7 @@ class Commit( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", + None, None ) return PaginatedList.PaginatedList( @@ -114,6 +116,7 @@ class Commit( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/CommitComment.py b/src/github/CommitComment.py index 18911043..6ecb7f10 100644 --- a/src/github/CommitComment.py +++ b/src/github/CommitComment.py @@ -73,6 +73,7 @@ class CommitComment( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -84,6 +85,7 @@ class CommitComment( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -109,6 +111,7 @@ class CommitComment( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/Download.py b/src/github/Download.py index fa3ec531..be312f1f 100644 --- a/src/github/Download.py +++ b/src/github/Download.py @@ -117,6 +117,7 @@ class Download( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -150,6 +151,7 @@ class Download( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/Gist.py b/src/github/Gist.py index 41fd6ff5..80fccd8b 100644 --- a/src/github/Gist.py +++ b/src/github/Gist.py @@ -100,6 +100,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/comments", + None, post_parameters ) return GistComment.GistComment( self.__requester, data, completion = NoCompletion ) @@ -108,6 +109,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/fork", + None, None ) return Gist( self.__requester, data, completion = NoCompletion ) @@ -116,6 +118,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -131,6 +134,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -140,6 +144,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists/comments/" + str( id ), + None, None ) return GistComment.GistComment( self.__requester, data, completion = NoCompletion ) @@ -148,6 +153,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", + None, None ) return PaginatedList.PaginatedList( @@ -161,6 +167,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/star", + None, None ) return status == 204 @@ -169,6 +176,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/star", + None, None ) @@ -176,6 +184,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/star", + None, None ) @@ -204,6 +213,7 @@ class Gist( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/GistComment.py b/src/github/GistComment.py index 45fb8f51..678fb90f 100644 --- a/src/github/GistComment.py +++ b/src/github/GistComment.py @@ -39,6 +39,7 @@ class GistComment( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -50,6 +51,7 @@ class GistComment( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) diff --git a/src/github/GitRef.py b/src/github/GitRef.py index 7abaef90..476c338c 100644 --- a/src/github/GitRef.py +++ b/src/github/GitRef.py @@ -27,6 +27,7 @@ class GitRef( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -42,6 +43,7 @@ class GitRef( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) diff --git a/src/github/Github.py b/src/github/Github.py index 67d6f72f..d7dee881 100644 --- a/src/github/Github.py +++ b/src/github/Github.py @@ -43,7 +43,7 @@ class Github( object ): return Gist.Gist( self.__requester, attributes, completion = ImmediateCompletion ) def get_gists( self ): - status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists/public", None ) + status, headers, data = self.__requester.request( "GET", "https://api.github.com/gists/public", None, None ) return PaginatedList.PaginatedList( Gist.Gist, self.__requester, diff --git a/src/github/Hook.py b/src/github/Hook.py index f7ee348b..cfd412e5 100644 --- a/src/github/Hook.py +++ b/src/github/Hook.py @@ -50,6 +50,7 @@ class Hook( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -78,6 +79,7 @@ class Hook( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -86,6 +88,7 @@ class Hook( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/test", + None, None ) diff --git a/src/github/Issue.py b/src/github/Issue.py index c41fa818..500eeb8a 100644 --- a/src/github/Issue.py +++ b/src/github/Issue.py @@ -115,6 +115,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/labels", + None, post_parameters ) @@ -126,6 +127,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/comments", + None, post_parameters ) return IssueComment.IssueComment( self.__requester, data, completion = NoCompletion ) @@ -134,6 +136,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/labels", + None, None ) @@ -167,6 +170,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -176,6 +180,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", self.__requester.parentUrl( str( self.url ) ) + "/comments" + "/" + str( id ), + None, None ) return IssueComment.IssueComment( self.__requester, data, completion = NoCompletion ) @@ -184,6 +189,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", + None, None ) return PaginatedList.PaginatedList( @@ -197,6 +203,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events", + None, None ) return PaginatedList.PaginatedList( @@ -210,6 +217,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/labels", + None, None ) return PaginatedList.PaginatedList( @@ -224,6 +232,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/labels" + "/" + str( label._identity ), + None, None ) @@ -233,6 +242,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/labels", + None, post_parameters ) @@ -264,6 +274,7 @@ class Issue( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/IssueComment.py b/src/github/IssueComment.py index ae16a452..5f61cc40 100644 --- a/src/github/IssueComment.py +++ b/src/github/IssueComment.py @@ -39,6 +39,7 @@ class IssueComment( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -50,6 +51,7 @@ class IssueComment( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) diff --git a/src/github/IssueEvent.py b/src/github/IssueEvent.py index b9fd02b8..fafd9140 100644 --- a/src/github/IssueEvent.py +++ b/src/github/IssueEvent.py @@ -67,6 +67,7 @@ class IssueEvent( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/Label.py b/src/github/Label.py index 1881c321..de368793 100644 --- a/src/github/Label.py +++ b/src/github/Label.py @@ -27,6 +27,7 @@ class Label( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -40,6 +41,7 @@ class Label( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) diff --git a/src/github/Milestone.py b/src/github/Milestone.py index 5b84fb3f..ca09e36e 100644 --- a/src/github/Milestone.py +++ b/src/github/Milestone.py @@ -60,6 +60,7 @@ class Milestone( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -83,6 +84,7 @@ class Milestone( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -91,6 +93,7 @@ class Milestone( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/labels", + None, None ) return PaginatedList.PaginatedList( diff --git a/src/github/NamedUser.py b/src/github/NamedUser.py index 3ec84805..5a9d51c4 100644 --- a/src/github/NamedUser.py +++ b/src/github/NamedUser.py @@ -162,6 +162,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/gists", + None, post_parameters ) return Gist.Gist( self.__requester, data, completion = NoCompletion ) @@ -170,6 +171,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events", + None, None ) return PaginatedList.PaginatedList( @@ -183,6 +185,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/followers", + None, None ) return PaginatedList.PaginatedList( @@ -196,6 +199,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/following", + None, None ) return PaginatedList.PaginatedList( @@ -209,6 +213,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/gists", + None, None ) return PaginatedList.PaginatedList( @@ -222,6 +227,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/orgs", + None, None ) return PaginatedList.PaginatedList( @@ -235,6 +241,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events/public", + None, None ) return PaginatedList.PaginatedList( @@ -248,6 +255,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/received_events/public", + None, None ) return PaginatedList.PaginatedList( @@ -261,6 +269,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/received_events", + None, None ) return PaginatedList.PaginatedList( @@ -275,6 +284,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/repos/" + str( self.login ) + "/" + str( name ), + None, None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -285,6 +295,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/repos", + None, None ) return PaginatedList.PaginatedList( @@ -298,6 +309,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/watched", + None, None ) return PaginatedList.PaginatedList( @@ -347,6 +359,7 @@ class NamedUser( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/Organization.py b/src/github/Organization.py index 05dc2e1d..59b9ffff 100644 --- a/src/github/Organization.py +++ b/src/github/Organization.py @@ -143,14 +143,19 @@ class Organization( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/public_members" + "/" + str( public_member._identity ), + None, None ) def create_fork( self, repo ): assert isinstance( repo, Repository.Repository ), repo + url_parameters = { + "org": str( self.login ), + } status, headers, data = self.__requester.request( "POST", - "https://api.github.com/repos/" + str( repo.owner.login ) + "/" + str( repo.name ) + "/forks?org=" + str( self.login ), + "https://api.github.com/repos/" + str( repo.owner.login ) + "/" + str( repo.name ) + "/forks", + url_parameters, None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -191,6 +196,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/repos", + None, post_parameters ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -211,6 +217,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/teams", + None, post_parameters ) return Team.Team( self.__requester, data, completion = NoCompletion ) @@ -245,6 +252,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -253,6 +261,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events", + None, None ) return PaginatedList.PaginatedList( @@ -266,6 +275,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/members", + None, None ) return PaginatedList.PaginatedList( @@ -279,6 +289,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/public_members", + None, None ) return PaginatedList.PaginatedList( @@ -293,6 +304,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/repos/" + str( self.login ) + "/" + str( name ), + None, None ) return Repository.Repository( self.__requester, data, completion = NoCompletion ) @@ -303,6 +315,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/repos", + None, None ) return PaginatedList.PaginatedList( @@ -317,6 +330,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/teams/" + str( id ), + None, None ) return Team.Team( self.__requester, data, completion = NoCompletion ) @@ -325,6 +339,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/teams", + None, None ) return PaginatedList.PaginatedList( @@ -339,6 +354,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/members" + "/" + str( member._identity ), + None, None ) return status == 204 @@ -348,6 +364,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/public_members" + "/" + str( public_member._identity ), + None, None ) return status == 204 @@ -357,6 +374,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/members" + "/" + str( member._identity ), + None, None ) @@ -365,6 +383,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/public_members" + "/" + str( public_member._identity ), + None, None ) @@ -402,6 +421,7 @@ class Organization( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/PaginatedList.py b/src/github/PaginatedList.py index 2d76abf9..6e29ed98 100644 --- a/src/github/PaginatedList.py +++ b/src/github/PaginatedList.py @@ -15,7 +15,7 @@ class PaginatedList: yield element if self.__nextUrl is not None: goOn = True - status, headers, data = self.__requester.request( "GET", self.__nextUrl, None ) + status, headers, data = self.__requester.request( "GET", self.__nextUrl, None, None ) self.__fromData( headers, data ) def __getitem__( self, index ): diff --git a/src/github/PullRequest.py b/src/github/PullRequest.py index 7de07a40..e4458514 100644 --- a/src/github/PullRequest.py +++ b/src/github/PullRequest.py @@ -161,6 +161,7 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/comments", + None, post_parameters ) return PullRequestComment.PullRequestComment( self.__requester, data, completion = NoCompletion ) @@ -183,6 +184,7 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -192,6 +194,7 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", self.__requester.parentUrl( str( self.url ) ) + "/comments" + "/" + str( id ), + None, None ) return PullRequestComment.PullRequestComment( self.__requester, data, completion = NoCompletion ) @@ -200,6 +203,7 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", + None, None ) return PaginatedList.PaginatedList( @@ -213,6 +217,7 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/commits", + None, None ) return PaginatedList.PaginatedList( @@ -226,6 +231,7 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/files", + None, None ) return PaginatedList.PaginatedList( @@ -239,6 +245,7 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/merge", + None, None ) return status == 204 @@ -253,6 +260,7 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/merge", + None, post_parameters ) @@ -292,6 +300,7 @@ class PullRequest( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/PullRequestComment.py b/src/github/PullRequestComment.py index 8fa9ccd0..ef927620 100644 --- a/src/github/PullRequestComment.py +++ b/src/github/PullRequestComment.py @@ -73,6 +73,7 @@ class PullRequestComment( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -84,6 +85,7 @@ class PullRequestComment( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -109,6 +111,7 @@ class PullRequestComment( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/Repository.py b/src/github/Repository.py index 59297e48..42b61723 100644 --- a/src/github/Repository.py +++ b/src/github/Repository.py @@ -192,6 +192,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/collaborators" + "/" + str( collaborator._identity ), + None, None ) @@ -199,6 +200,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/compare/" + str( base ) + "..." + str( head ), + None, None ) return data @@ -221,6 +223,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/downloads", + None, post_parameters ) return Download.Download( self.__requester, data, completion = NoCompletion ) @@ -235,6 +238,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/blobs", + None, post_parameters ) return GitBlob.GitBlob( self.__requester, data, completion = NoCompletion ) @@ -254,6 +258,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/commits", + None, post_parameters ) return GitCommit.GitCommit( self.__requester, data, completion = NoCompletion ) @@ -268,6 +273,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/refs", + None, post_parameters ) return GitRef.GitRef( self.__requester, data, completion = NoCompletion ) @@ -288,6 +294,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/tags", + None, post_parameters ) return GitTag.GitTag( self.__requester, data, completion = NoCompletion ) @@ -301,6 +308,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/git/trees", + None, post_parameters ) return GitTree.GitTree( self.__requester, data, completion = NoCompletion ) @@ -322,6 +330,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/hooks", + None, post_parameters ) return Hook.Hook( self.__requester, data, completion = NoCompletion ) @@ -350,6 +359,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/issues", + None, post_parameters ) return Issue.Issue( self.__requester, data, completion = NoCompletion ) @@ -364,6 +374,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/keys", + None, post_parameters ) return RepositoryKey.RepositoryKey( self.__requester, data, completion = NoCompletion, repoUrl = self.url ) @@ -378,6 +389,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/labels", + None, post_parameters ) return Label.Label( self.__requester, data, completion = NoCompletion ) @@ -402,6 +414,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/milestones", + None, post_parameters ) return Milestone.Milestone( self.__requester, data, completion = NoCompletion ) @@ -426,6 +439,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "POST", str( self.url ) + "/pulls", + None, post_parameters ) return PullRequest.PullRequest( self.__requester, data, completion = NoCompletion ) @@ -462,6 +476,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -470,6 +485,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/branches", + None, None ) return PaginatedList.PaginatedList( @@ -483,6 +499,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/collaborators", + None, None ) return PaginatedList.PaginatedList( @@ -497,6 +514,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments" + "/" + str( id ), + None, None ) return CommitComment.CommitComment( self.__requester, data, completion = NoCompletion ) @@ -505,6 +523,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/comments", + None, None ) return PaginatedList.PaginatedList( @@ -519,6 +538,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/commits" + "/" + str( sha ), + None, None ) return Commit.Commit( self.__requester, data, completion = NoCompletion ) @@ -531,6 +551,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/commits", + None, None ) return PaginatedList.PaginatedList( @@ -544,6 +565,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/contributors", + None, None ) return PaginatedList.PaginatedList( @@ -558,6 +580,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/downloads" + "/" + str( id ), + None, None ) return Download.Download( self.__requester, data, completion = NoCompletion ) @@ -566,6 +589,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/downloads", + None, None ) return PaginatedList.PaginatedList( @@ -579,6 +603,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/events", + None, None ) return PaginatedList.PaginatedList( @@ -592,6 +617,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/forks", + None, None ) return PaginatedList.PaginatedList( @@ -606,6 +632,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/blobs" + "/" + str( sha ), + None, None ) return GitBlob.GitBlob( self.__requester, data, completion = NoCompletion ) @@ -615,6 +642,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/commits" + "/" + str( sha ), + None, None ) return GitCommit.GitCommit( self.__requester, data, completion = NoCompletion ) @@ -624,6 +652,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/" + str( ref ), + None, None ) return GitRef.GitRef( self.__requester, data, completion = NoCompletion ) @@ -632,6 +661,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/refs", + None, None ) return PaginatedList.PaginatedList( @@ -646,6 +676,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/tags" + "/" + str( sha ), + None, None ) return GitTag.GitTag( self.__requester, data, completion = NoCompletion ) @@ -657,6 +688,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/git/trees" + "/" + str( sha ), + None, None ) return GitTree.GitTree( self.__requester, data, completion = NoCompletion ) @@ -666,6 +698,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/hooks" + "/" + str( id ), + None, None ) return Hook.Hook( self.__requester, data, completion = NoCompletion ) @@ -674,6 +707,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/hooks", + None, None ) return PaginatedList.PaginatedList( @@ -688,6 +722,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/issues" + "/" + str( number ), + None, None ) return Issue.Issue( self.__requester, data, completion = NoCompletion ) @@ -712,6 +747,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/issues", + None, None ) return PaginatedList.PaginatedList( @@ -726,6 +762,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/issues/events" + "/" + str( id ), + None, None ) return IssueEvent.IssueEvent( self.__requester, data, completion = NoCompletion ) @@ -734,6 +771,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/issues/events", + None, None ) return PaginatedList.PaginatedList( @@ -748,6 +786,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/keys" + "/" + str( id ), + None, None ) return RepositoryKey.RepositoryKey( self.__requester, data, completion = NoCompletion, repoUrl = self.url ) @@ -756,6 +795,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/keys", + None, None ) return PaginatedList.PaginatedList( @@ -770,6 +810,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/labels/" + urllib.quote( str( name ) ), + None, None ) return Label.Label( self.__requester, data, completion = NoCompletion ) @@ -778,6 +819,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/labels", + None, None ) return PaginatedList.PaginatedList( @@ -791,6 +833,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/languages", + None, None ) return data @@ -800,6 +843,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/milestones" + "/" + str( number ), + None, None ) return Milestone.Milestone( self.__requester, data, completion = NoCompletion ) @@ -814,6 +858,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/milestones", + None, None ) return PaginatedList.PaginatedList( @@ -827,6 +872,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", "https://api.github.com/networks/" + str( self.owner.login ) + "/" + str( self.name ) + "/events", + None, None ) return PaginatedList.PaginatedList( @@ -841,6 +887,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/pulls" + "/" + str( number ), + None, None ) return PullRequest.PullRequest( self.__requester, data, completion = NoCompletion ) @@ -851,6 +898,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/pulls", + None, None ) return PaginatedList.PaginatedList( @@ -864,6 +912,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/tags", + None, None ) return PaginatedList.PaginatedList( @@ -877,6 +926,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/teams", + None, None ) return PaginatedList.PaginatedList( @@ -890,6 +940,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/watchers", + None, None ) return PaginatedList.PaginatedList( @@ -904,6 +955,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/collaborators" + "/" + str( collaborator._identity ), + None, None ) return status == 204 @@ -913,6 +965,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/collaborators" + "/" + str( collaborator._identity ), + None, None ) @@ -960,6 +1013,7 @@ class Repository( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/RepositoryKey.py b/src/github/RepositoryKey.py index 297f6554..627fba5c 100644 --- a/src/github/RepositoryKey.py +++ b/src/github/RepositoryKey.py @@ -47,6 +47,7 @@ class RepositoryKey( object ): status, headers, data = self.__requester.request( "DELETE", self.__customUrl, + None, None ) @@ -64,6 +65,7 @@ class RepositoryKey( object ): status, headers, data = self.__requester.request( "PATCH", self.__customUrl, + None, post_parameters ) self.__useAttributes( data ) @@ -83,6 +85,7 @@ class RepositoryKey( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/Requester.py b/src/github/Requester.py index 6a64b6b8..8ccb30b8 100644 --- a/src/github/Requester.py +++ b/src/github/Requester.py @@ -18,7 +18,7 @@ class Requester: self.__authorizationHeader = None self.rate_limiting = ( 5000, 5000 ) - def request( self, verb, url, input ): + def request( self, verb, url, parameters, input ): assert verb in [ "HEAD", "GET", "POST", "PATCH", "PUT", "DELETE" ] assert url.startswith( "https://api.github.com" ) url = url[ len( "https://api.github.com" ) : ] @@ -30,7 +30,7 @@ class Requester: cnx = httplib.HTTPSConnection( "api.github.com", strict = True ) cnx.request( verb, - url, + self.__completeUrl( url, parameters ), json.dumps( input ), headers ) @@ -44,9 +44,15 @@ class Requester: self.rate_limiting = ( int( headers[ "x-ratelimit-remaining" ] ), int( headers[ "x-ratelimit-limit" ] ) ) - # print verb, url, input, "==>", status, str( headers )[ :30 ], str( output )[ :30 ] + # print verb, url, parameters, input, "==>", status, str( headers )[ :30 ], str( output )[ :30 ] return status, headers, output + def __completeUrl( self, url, parameters ): + if parameters is None or len( parameters ) == 0: + return url + else: + return url + "?" + urllib.urlencode( parameters ) + def __structuredFromJson( self, data ): if len( data ) == 0: return None diff --git a/src/github/Team.py b/src/github/Team.py index 999d6396..f3e7d523 100644 --- a/src/github/Team.py +++ b/src/github/Team.py @@ -50,6 +50,7 @@ class Team( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/members" + "/" + str( member._identity ), + None, None ) @@ -58,6 +59,7 @@ class Team( object ): status, headers, data = self.__requester.request( "PUT", str( self.url ) + "/repos" + "/" + str( repo._identity ), + None, None ) @@ -65,6 +67,7 @@ class Team( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -80,6 +83,7 @@ class Team( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -88,6 +92,7 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/members", + None, None ) return PaginatedList.PaginatedList( @@ -101,6 +106,7 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/repos", + None, None ) return PaginatedList.PaginatedList( @@ -115,6 +121,7 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/members" + "/" + str( member._identity ), + None, None ) return status == 204 @@ -124,6 +131,7 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", str( self.url ) + "/repos" + "/" + str( repo._identity ), + None, None ) return status == 204 @@ -133,6 +141,7 @@ class Team( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/members" + "/" + str( member._identity ), + None, None ) @@ -141,6 +150,7 @@ class Team( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ) + "/repos" + "/" + str( repo._identity ), + None, None ) @@ -160,6 +170,7 @@ class Team( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data ) diff --git a/src/github/UserKey.py b/src/github/UserKey.py index 32c8b230..4205bb3c 100644 --- a/src/github/UserKey.py +++ b/src/github/UserKey.py @@ -42,6 +42,7 @@ class UserKey( object ): status, headers, data = self.__requester.request( "DELETE", str( self.url ), + None, None ) @@ -59,6 +60,7 @@ class UserKey( object ): status, headers, data = self.__requester.request( "PATCH", str( self.url ), + None, post_parameters ) self.__useAttributes( data ) @@ -78,6 +80,7 @@ class UserKey( object ): status, headers, data = self.__requester.request( "GET", self.__url, + None, None ) self.__useAttributes( data )