Merge lp:~nataliabidart/ubuntu/precise/ubuntu-sso-client/ubuntu-sso-client-2.99.1 into lp:ubuntu/precise/ubuntu-sso-client

[Natalia Bidart]

- Updating debian/watch to download from latest milestone.
- New upstream release.

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'PKG-INFO'
--- PKG-INFO	2011-12-20 17:33:13 +0000
+++ PKG-INFO	2012-01-03 19:31:27 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntu-sso-client
-Version: 2.99.0
+Version: 2.99.1
 Summary: Ubuntu Single Sign-On client
 Home-page: https://launchpad.net/ubuntu-sso-client
 Author: Natalia Bidart

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-21 10:28:36 +0000
+++ debian/changelog	2012-01-03 19:31:27 +0000
@@ -1,3 +1,13 @@
+ubuntu-sso-client (2.99.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    [ Guillermo Gonzalez <[e-mail]> ]
+      - Remove _ping_url inlineCallbacks and make it return a deferred in
+        order to make it work with twisted 11.1 (LP: #910163).
+  * debian/watch: download from latest milestone.
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Tue, 03 Jan 2012 16:02:33 -0300
+
 ubuntu-sso-client (2.99.0-0ubuntu1) precise; urgency=low
 
   * New upstream release:

=== modified file 'debian/watch'
--- debian/watch	2011-12-20 17:21:53 +0000
+++ debian/watch	2012-01-03 19:31:27 +0000
@@ -1,2 +1,2 @@
 version=3
-http://launchpad.net/ubuntu-sso-client/stable-3-0/2.99.0/ .*/ubuntu-sso-client-([0-9.]+)\.tar\.gz
+http://launchpad.net/ubuntu-sso-client/stable-3-0/2.99.1/ .*/ubuntu-sso-client-([0-9.]+)\.tar\.gz

=== modified file 'setup.py'
--- setup.py	2011-12-20 17:33:13 +0000
+++ setup.py	2012-01-03 19:31:27 +0000
@@ -364,7 +364,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntu-sso-client',
-    version='2.99.0',
+    version='2.99.1',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',

=== modified file 'ubuntu_sso/credentials.py'
--- ubuntu_sso/credentials.py	2011-08-25 19:08:26 +0000
+++ ubuntu_sso/credentials.py	2012-01-03 19:31:27 +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-20 17:33:13 +0000
+++ ubuntu_sso/utils/webclient/libsoup.py	2012-01-03 19:31:27 +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()