Merge lp:~verterok/ubuntu-sso-client/fix-910163 into lp:ubuntu-sso-client

[Guillermo Gonzalez]

Remove _ping_url inlineCallbacks and make it return a deferred in order to make it work with twisted 11.1.

Remove _ping_url inlineCallbacks and make it return a deferred in order to make it work with twisted 11.1.

I didn't add any tests with the change, as the tests are already failing in Precise.

[dobey (dobey)]

This doesn't seem like a proper fix, and it doesn't fix the other methods in the code which have the same problem with twisted >= 11.1.0.

review: Needs Fixing

[Guillermo Gonzalez (verterok)]

> This doesn't seem like a proper fix, and it doesn't fix the other methods in
> the code which have the same problem with twisted >= 11.1.0.

There are no other methods with @inlineCallbacks and not doing a yield.

It's the easiest way to fix it, as removing @inlineCallbacks we need to reimplement the @handle_failures decorator for synchronous methods, as it's decorating the wrapper with @inlineCallbacks

[lp:~verterok/ubuntu-sso-client/fix-910163]

827. By Guillermo Gonzalez on 2011-12-30

drop inlineCallbacks decorator and return a deferred instead of doing a yield

[dobey (dobey)]

The deferred seems like a better fix indeed. :)

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/credentials.py'
--- ubuntu_sso/credentials.py	2011-08-22 16:21:36 +0000
+++ ubuntu_sso/credentials.py	2011-12-30 19:00:30 +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):