Merge lp:~nataliabidart/ubuntu-sso-client/stable-3-0-update-2.99.1 into lp:ubuntu-sso-client/stable-3-0

[Natalia Bidart]

[ Guillermo Gonzalez <email address hidden> ]
  - Remove _ping_url inlineCallbacks and make it return a deferred in order to
    make it work with twisted 11.1 (LP: #910163).
[ Rodney Dawes <email address hidden> ]
  - Disable a lint warning, to prevent builds failing on Lucid

[dobey (dobey)]

review: Approve

=== modified file 'ubuntu_sso/credentials.py'
--- ubuntu_sso/credentials.py	2011-08-22 16:21:36 +0000
+++ ubuntu_sso/credentials.py	2012-01-03 16:18:29 +0000
@@ -43,6 +43,7 @@
 
 from functools import wraps
 
+from twisted.internet import defer
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 from ubuntu_sso import NO_OP, utils
@@ -216,7 +217,6 @@
         self.denial_cb(app_name)
 
     @handle_failures(msg='Problem opening the ping_url')
-    @inlineCallbacks
     def _ping_url(self, app_name, email, credentials):
         """Ping the self.ping_url with the email attached.
 
@@ -245,7 +245,7 @@
         # but the returned deferred will never be fired (nataliabidart).
         response = urllib2.urlopen(request)
         logger.debug('Url opened. Response: %s.', response.code)
-        returnValue(response)
+        return defer.succeed(response)
 
     @handle_exceptions(msg='Problem opening the Ubuntu SSO user interface')
     def _show_ui(self, login_only):

=== modified file 'ubuntu_sso/utils/webclient/libsoup.py'
--- ubuntu_sso/utils/webclient/libsoup.py	2011-12-19 19:42:29 +0000
+++ ubuntu_sso/utils/webclient/libsoup.py	2012-01-03 16:18:29 +0000
@@ -33,7 +33,7 @@
     def __init__(self, *args, **kwargs):
         """Initialize this instance."""
         super(WebClient, self).__init__(*args, **kwargs)
-        # pylint: disable=E0611
+        # pylint: disable=E0611,F0401
         from gi.repository import Soup, SoupGNOME
         self.soup = Soup
         self.session = Soup.SessionAsync()