Merge branch 'pr/198' into develop

Barry Morrison and Ian Cordasco · sigmavirus24 · commit 7d947301afda · 2014-02-17T21:28:17.000-06:00
diff --git a/github3/github.py b/github3/github.py
@@ -7,8 +7,6 @@
 
 """
 
-from json import dumps
-from requests import session
 from github3.auths import Authorization
 from github3.decorators import requires_auth, requires_basic_auth
 from github3.events import Event
@@ -103,19 +101,26 @@ def authorize(self, login, password, scopes=None, note='', note_url='',
         :returns: :class:`Authorization <Authorization>`
         """
         json = None
+        # TODO: Break this behaviour in 1.0 (Don't rely on self._session.auth)
         auth = self._session.auth or (login and password)
         if auth:
             url = self._build_url('authorizations')
             data = {'note': note, 'note_url': note_url,
                     'client_id': client_id, 'client_secret': client_secret}
             if scopes:
                 data['scopes'] = scopes
-            if self._session.auth:
-                json = self._json(self._post(url, data=data), 201)
-            else:
-                ses = session()
-                ses.auth = (login, password)
-                json = self._json(ses.post(url, data=dumps(data)), 201)
+            # TODO: Unconditionally use the login and password, e.g.,
+            # old_auth = self._session.auth
+            # self.login(login, password)
+            # json = self._json(...)
+            # self._session.auth = old_auth
+            do_logout = False
+            if not self._session.auth:
+                do_logout = True
+                self.login(login, password)
+            json = self._json(self._post(url, data=data), 201)
+            if do_logout:
+                self._session.auth = None
         return Authorization(json, self) if json else None
 
     def check_authorization(self, access_token):
