Merge lp:~robru/gwibber/get_tokens into lp:~barry/gwibber/py3

[Robert Bruce Park]

=== modified file 'gwibber/gwibber/protocols/foursquare.py'
--- gwibber/gwibber/protocols/foursquare.py	2012-09-21 22:02:40 +0000
+++ gwibber/gwibber/protocols/foursquare.py	2012-09-25 18:59:51 +0000
@@ -76,14 +76,6 @@
             self._account.user_id = uid
             log.debug('FourSquare UID is: {}', uid)
 
-    def _get_access_token(self):
-        """Return an access token, logging in if necessary."""
-        if self._account.access_token is None:
-            if not self._login():
-                log.error('No FourSquare authenticate results received.')
-                return None
-        return self._account.access_token
-
     def receive(self):
         """Gets a list of each friend's most recent check-ins."""
         token = self._get_access_token()

=== modified file 'gwibber/gwibber/utils/base.py'
--- gwibber/gwibber/utils/base.py	2012-09-21 22:01:33 +0000
+++ gwibber/gwibber/utils/base.py	2012-09-25 18:59:51 +0000
@@ -202,6 +202,16 @@
                 row[IDS_IDX] = row[IDS_IDX] + args[IDS_IDX]
             return key in _seen_messages
 
+    def _get_access_token(self):
+        """Return an access token, logging in if necessary."""
+        if self._account.access_token is None:
+            if not self._login():
+                log.error(
+                    'No {} authentication results received.'.format(
+                        self.__class__.__name__))
+                return None
+        return self._account.access_token
+
     def _login(self):
         """Prevent redundant login attempts."""
         # The first time the user logs in, we expect old_token to be None.