From 84dff1cca70806dd51440fef0634626fd5180a59 Mon Sep 17 00:00:00 2001 From: Vincent Jacques Date: Tue, 8 May 2012 08:59:13 +0100 Subject: [PATCH] Fix testKeys --- IntegrationTest.py | 21 ++++++++-------- .../description.000.human_readable.json | 1 + .../description.001.normalized.json | 24 +++---------------- github/GithubObjects/AuthenticatedUser.py | 6 ++--- 4 files changed, 17 insertions(+), 35 deletions(-) diff --git a/IntegrationTest.py b/IntegrationTest.py index cfa9b878..e1c6b2ee 100644 --- a/IntegrationTest.py +++ b/IntegrationTest.py @@ -511,17 +511,16 @@ class IntegrationTest: def testIssuesForAuthenticatedUser( self ): self.printList( "Issues", self.g.get_user().get_issues(), lambda i: i.title ) - # @todo custom url /user/keys instead of /users/jacquev6/keys - # def testKeys( self ): - # u = self.g.get_user() - # self.printList( "Keys", u.get_keys(), lambda k: k.title ) - # k = u.create_key( u.login + "@PyGithub", "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvborozfBBn2a+JETqPekTWZ1tmYjpfH9wTKFPLjIXQmxXjNye6HVgvi+iMI436RdoLsPEFDe3cjrQ6CJa7KzhRJKNTPh5EZbKI13CXfMGr7V1i3tOokXBFSRQKnDx2dj2hnswqxGUk2jXpgC/KA1q71yqnL45CBlWr50eDpwUIEPnmqSrPpRV/0ZGwIlh4o7+6HwPUF9aBhWj945WSkjZubR4UFWlDZl7ROafpkJHs2cQzaxtmBOZnu6dzmfyro0zJsvhZKD2K6d9eKgpDeKaw5rWr6FeOZPd4xyDaV1gctG0YEui8uuSPKhpcykgREUAFf+vmOKt+yXnOoq8P4vIQ==" ) - # self.printList( "Keys", u.get_keys(), lambda k: k.title ) - # k.edit( title = u.login + "@PyGithub2" ) - # k = u.get_key( k.id ) - # self.printList( "Keys", u.get_keys(), lambda k: k.title ) - # k.delete() - # self.printList( "Keys", u.get_keys(), lambda k: k.title ) + def testKeys( self ): + u = self.g.get_user() + self.printList( "Keys", u.get_keys(), lambda k: k.title ) + k = u.create_key( u.login + "@PyGithub", "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvborozfBBn2a+JETqPekTWZ1tmYjpfH9wTKFPLjIXQmxXjNye6HVgvi+iMI436RdoLsPEFDe3cjrQ6CJa7KzhRJKNTPh5EZbKI13CXfMGr7V1i3tOokXBFSRQKnDx2dj2hnswqxGUk2jXpgC/KA1q71yqnL45CBlWr50eDpwUIEPnmqSrPpRV/0ZGwIlh4o7+6HwPUF9aBhWj945WSkjZubR4UFWlDZl7ROafpkJHs2cQzaxtmBOZnu6dzmfyro0zJsvhZKD2K6d9eKgpDeKaw5rWr6FeOZPd4xyDaV1gctG0YEui8uuSPKhpcykgREUAFf+vmOKt+yXnOoq8P4vIQ==" ) + self.printList( "Keys", u.get_keys(), lambda k: k.title ) + k.edit( title = u.login + "@PyGithub2" ) + k = u.get_key( k.id ) + self.printList( "Keys", u.get_keys(), lambda k: k.title ) + k.delete() + self.printList( "Keys", u.get_keys(), lambda k: k.title ) def testMergePullRequest( self ): r = self.g.get_user().get_repo( "TestPyGithub" ) diff --git a/JsonDescriptionOfGithubApiV3/description.000.human_readable.json b/JsonDescriptionOfGithubApiV3/description.000.human_readable.json index 21b38c49..c42ffa93 100644 --- a/JsonDescriptionOfGithubApiV3/description.000.human_readable.json +++ b/JsonDescriptionOfGithubApiV3/description.000.human_readable.json @@ -75,6 +75,7 @@ "name": "keys", "singularName": "key", "type": "UserKey", + "url": [ { "type": "constant", "value": "https://api.github.com/user/keys" } ], "getList": true, "getElement": { "parameter": { "name": "id", "type": "@todo" } diff --git a/JsonDescriptionOfGithubApiV3/description.001.normalized.json b/JsonDescriptionOfGithubApiV3/description.001.normalized.json index 609311ae..b842d814 100644 --- a/JsonDescriptionOfGithubApiV3/description.001.normalized.json +++ b/JsonDescriptionOfGithubApiV3/description.001.normalized.json @@ -501,15 +501,9 @@ ], "request": { "url": [ - { - "type": "attribute", - "value": [ - "url" - ] - }, { "type": "constant", - "value": "/keys" + "value": "https://api.github.com/user/keys" } ], "information": "status", @@ -542,15 +536,9 @@ ], "request": { "url": [ - { - "type": "attribute", - "value": [ - "url" - ] - }, { "type": "constant", - "value": "/keys" + "value": "https://api.github.com/user/keys" }, { "type": "constant", @@ -583,15 +571,9 @@ "mandatoryParameters": [], "request": { "url": [ - { - "type": "attribute", - "value": [ - "url" - ] - }, { "type": "constant", - "value": "/keys" + "value": "https://api.github.com/user/keys" } ], "information": "data", diff --git a/github/GithubObjects/AuthenticatedUser.py b/github/GithubObjects/AuthenticatedUser.py index 19bf81c2..272f1cb4 100644 --- a/github/GithubObjects/AuthenticatedUser.py +++ b/github/GithubObjects/AuthenticatedUser.py @@ -223,7 +223,7 @@ class AuthenticatedUser( object ): } status, headers, data = self.__requester.request( "POST", - str( self.url ) + "/keys", + "https://api.github.com/user/keys", None, post_parameters ) @@ -385,7 +385,7 @@ class AuthenticatedUser( object ): def get_key( self, id ): status, headers, data = self.__requester.request( "GET", - str( self.url ) + "/keys" + "/" + str( id ), + "https://api.github.com/user/keys" + "/" + str( id ), None, None ) @@ -394,7 +394,7 @@ class AuthenticatedUser( object ): def get_keys( self ): status, headers, data = self.__requester.request( "GET", - str( self.url ) + "/keys", + "https://api.github.com/user/keys", None, None )