Add support for Github's OAuth authentication URLs.

nvie · nvie · commit 988dddede525 · 2010-12-06T12:47:56.000-08:00
When using OAuth instead of api_token authentication, these URL's don't
POST username+api_token, but add a ?access_token= query parameter to the
calls.
diff --git a/github2/client.py b/github2/client.py
@@ -7,7 +7,7 @@
 class Github(object):
 
     def __init__(self, username=None, api_token=None, debug=False,
-        requests_per_second=None):
+        requests_per_second=None, access_token=None):
         """
         An interface to GitHub's API:
             http://develop.github.com/
@@ -17,6 +17,10 @@ def __init__(self, username=None, api_token=None, debug=False,
     
             `api_token` can be found here (while logged in as that user):
                 https://github.com/account
+
+            `access_token` can be used when no ``username`` and/or ``api_token``
+                is used.  The ``access_token`` is the OAuth access token that is
+                received after successful OAuth authentication.
     
             `requests_per_second` is a float indicating the API rate limit
                 you're operating under (1 per second per GitHub at the moment),
@@ -28,7 +32,8 @@ def __init__(self, username=None, api_token=None, debug=False,
         self.debug = debug
         self.request = GithubRequest(username=username, api_token=api_token,
                                      debug=self.debug, 
-                                     requests_per_second=requests_per_second)
+                                     requests_per_second=requests_per_second,
+                                     access_token=access_token)
         self.issues = Issues(self.request)
         self.users = Users(self.request)
         self.repos = Repositories(self.request)
diff --git a/github2/request.py b/github2/request.py
@@ -31,12 +31,13 @@ class GithubRequest(object):
     }
 
     def __init__(self, username=None, api_token=None, url_prefix=None, 
-            debug=False, requests_per_second=None):
+            debug=False, requests_per_second=None, access_token=None):
         """
         Make an API request.
         """
         self.username = username
         self.api_token = api_token
+        self.access_token = access_token
         self.url_prefix = url_prefix
         self.debug = debug
         if requests_per_second is None:
@@ -52,7 +53,9 @@ def __init__(self, username=None, api_token=None, url_prefix=None,
             }
 
     def encode_authentication_data(self, extra_post_data):
-        if self.username and self.api_token:
+        if self.access_token:
+            post_data = {"access_token": self.access_token}
+        elif self.username and self.api_token:
             post_data = {"login": self.username,
                          "token": self.api_token}
         else:
