Add changes to the Authoriztaions API.

sigmavirus24 · sigmavirus24 · commit dbf7b6959068 · 2012-12-03T11:20:41.000-05:00
Authorizations change - 27e8e0d1373870d20fbf1fbc7dacaf908510a507
Also, accurately track User-Agent via version number.
diff --git a/github3/api.py b/github3/api.py
@@ -12,7 +12,8 @@
 gh = GitHub()
 
 
-def authorize(login, password, scopes, note='', note_url=''):
+def authorize(login, password, scopes, note='', note_url='', client_id='',
+              client_secret=''):
     """Obtain an authorization token from the GitHub API for the GitHub
     API.
 
@@ -22,6 +23,10 @@ def authorize(login, password, scopes, note='', note_url=''):
         i.e., 'gist', 'user'
     :param str note: (optional), note about the authorization
     :param str note_url: (optional), url for the application
+    :param str client_id: (optional), 20 character OAuth client key for which
+        to create a token
+    :param str client_secret: (optional), 40 character OAuth client secret for
+        which to create the token
     :returns: :class:`Authorization <Authorization>`
     """
     return gh.authorize(login, password, scopes, note, note_url)
diff --git a/github3/github.py b/github3/github.py
@@ -77,7 +77,8 @@ def authorization(self, id_num):
             json = self._json(self._get(url), 200)
         return Authorization(json, self) if json else None
 
-    def authorize(self, login, password, scopes, note='', note_url=''):
+    def authorize(self, login, password, scopes, note='', note_url='',
+                  client_id='', client_secret=''):
         """Obtain an authorization token from the GitHub API for the GitHub
         API.
 
@@ -87,14 +88,18 @@ def authorize(self, login, password, scopes, note='', note_url=''):
             i.e., 'gist', 'user'
         :param str note: (optional), note about the authorization
         :param str note_url: (optional), url for the application
+        :param str client_id: (optional), 20 character OAuth client key for
+            which to create a token
+        :param str client_secret: (optional), 40 character OAuth client secret
+            for which to create the token
         :returns: :class:`Authorization <Authorization>`
         """
         json = None
         auth = self._session.auth or (login and password)
         if isinstance(scopes, list) and auth:
             url = self._build_url('authorizations')
-            data = {'scopes': scopes, 'note': note,
-                    'note_url': note_url}
+            data = {'scopes': scopes, 'note': note, 'note_url': note_url,
+                    'client_id': client_id, 'client_secret': client_secret}
             if self._session.auth:
                 json = self._json(self._post(url, data=data), 201)
             else:
diff --git a/github3/models.py b/github3/models.py
@@ -11,6 +11,7 @@
 from requests.compat import urlparse
 from github3.decorators import requires_auth
 from github3.packages.PySO8601 import parse
+from github3 import __version__
 
 __url_cache__ = {}
 
@@ -37,11 +38,6 @@ def from_json(cls, json):
         return cls(json)
 
 
-def json_hook(args):
-    if args.get('data') and not args.get('files'):
-        args['data'] = dumps(args['data'])
-
-
 class GitHubCore(GitHubObject):
     """The :class:`GitHubCore <GitHubCore>` object. This class provides some
     basic attributes to other classes that are very useful to have.
@@ -62,9 +58,14 @@ def __init__(self, json, ses=None):
             # Always sending JSON
             'Content-Type': "application/json",
             # Set our own custom User-Agent string
-            'User-Agent': 'github3.py/0.1b0',
+            'User-Agent': 'github3.py/{0}'.format(__version__),
         }
 
+        # Requests hook
+        def json_hook(args):
+            if args.get('data') and not args.get('files'):
+                args['data'] = dumps(args['data'])
+
         self._session.headers.update(headers)
         self._session.config['base_headers'].update(headers)
         self._session.hooks.update({'args': [json_hook]})
