Merge lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-1.0.0 into lp:ubuntu/maverick/ubuntu-sso-client

[Natalia Bidart]

Minor tweaks. Releasing 1.0.0.

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-09-08 19:25:02 +0000
+++ PKG-INFO	2010-09-13 15:04:46 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntu-sso-client
-Version: 0.99.6
+Version: 1.0.0
 Summary: Ubuntu Single Sign-On client
 Home-page: https://launchpad.net/ubuntu-sso-client
 Author: Natalia Bidart
@@ -8,16 +8,4 @@
 License: GPL v3
 Description: Desktop service to allow applications to sign into Ubuntu services via SSO
 Platform: UNKNOWN
-Requires: contrib.testing.testcase
-Requires: dbus
-Requires: gnomekeyring
-Requires: gobject
-Requires: gtk
-Requires: mocker
-Requires: oauth
-Requires: twisted.internet
-Requires: twisted.python
-Requires: twisted.trial.unittest
-Requires: webkit
-Requires: xdg
 Provides: ubuntu_sso

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-09 15:03:00 +0000
+++ debian/changelog	2010-09-13 15:04:46 +0000
@@ -1,3 +1,17 @@
+ubuntu-sso-client (1.0.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+
+  [ Natalia B. Bidart <[e-mail]> ]
+    * Import of gui module is delayed until actually needed, to remove high
+    level dependency against graphical modules.
+
+  [ Natalia B. Bidart <[e-mail]> ]
+    * Passing a second parameter 'None' to gnomekerying.create_sync (LP:
+    #634465).
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Mon, 13 Sep 2010 11:43:43 -0300
+
 ubuntu-sso-client (0.99.6-0ubuntu1) maverick; urgency=low
 
   * New upstream release (0.99.6):

=== modified file 'debian/control'
--- debian/control	2010-08-24 20:24:21 +0000
+++ debian/control	2010-09-13 15:04:46 +0000
@@ -15,6 +15,7 @@
 XB-Python-Version: ${python:Versions}
 Depends: ${misc:Depends},
  ${python:Depends},
+ dpkg (>=1.15.7.2),
  python-dbus,
  python-gnomekeyring,
  python-gtk2,

=== modified file 'setup.py'
--- setup.py	2010-09-08 19:25:02 +0000
+++ setup.py	2010-09-13 15:04:46 +0000
@@ -86,7 +86,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntu-sso-client',
-    version='0.99.6',
+    version='1.0.0',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',

=== modified file 'ubuntu_sso/keyring.py'
--- ubuntu_sso/keyring.py	2010-09-08 19:25:02 +0000
+++ ubuntu_sso/keyring.py	2010-09-13 15:04:46 +0000
@@ -58,6 +58,7 @@
 
 class Keyring(object):
     """A Keyring for a given application name."""
+
     KEYRING_NAME = "login"
 
     def __init__(self, app_name):
@@ -71,7 +72,7 @@
         """Creates a keyring, or if it already exists, it does nothing."""
         keyring_names = gnomekeyring.list_keyring_names_sync()
         if not name in keyring_names:
-            gnomekeyring.create_sync(name)
+            gnomekeyring.create_sync(name, None)
 
     def _find_keyring_item(self, attr=None):
         """Return the keyring item or None if not found."""

=== modified file 'ubuntu_sso/main.py'
--- ubuntu_sso/main.py	2010-09-08 19:25:02 +0000
+++ ubuntu_sso/main.py	2010-09-13 15:04:46 +0000
@@ -43,7 +43,7 @@
 # pylint: enable=F0401
 from oauth import oauth
 
-from ubuntu_sso import DBUS_IFACE_USER_NAME, DBUS_IFACE_CRED_NAME, gui
+from ubuntu_sso import DBUS_IFACE_USER_NAME, DBUS_IFACE_CRED_NAME
 from ubuntu_sso.keyring import Keyring, get_token_name, U1_APP_NAME
 from ubuntu_sso.logger import setup_logging
 
@@ -555,6 +555,8 @@
                                    win_id, login_only=False):
         """Shows the UI so the user can login or register."""
         try:
+            # delay gui import to be able to function on non-graphical envs
+            from ubuntu_sso import gui
             gui_app = gui.UbuntuSSOClientGUI(app_name, tc_url,
                                              help_text, win_id, login_only)
             gui_app.connect(gui.SIG_LOGIN_SUCCEEDED, self._login_success_cb)

=== modified file 'ubuntu_sso/tests/test_keyring.py'
--- ubuntu_sso/tests/test_keyring.py	2010-09-08 19:25:02 +0000
+++ ubuntu_sso/tests/test_keyring.py	2010-09-13 15:04:46 +0000
@@ -93,9 +93,9 @@
         """The keyring you are looking for may be here."""
         return self.keyrings
 
-    def create_sync(self, name):
+    def create_sync(self, name, password):
         """Thanks, I'll create that keyring for you."""
-        self.keyrings.add(name)
+        self.keyrings.add((name, password))
 
     def is_available(self):
         """A very available keyring."""
@@ -163,6 +163,8 @@
 
         self.assertEqual(len(self.mgk.store), 2)
         self.assertEqual(len(self.mgk.deleted), 0)
+        self.assertEqual(self.mgk.keyrings,
+                         set([(keyring.Keyring.KEYRING_NAME, None)]))
 
     def test_delete_ubuntusso(self):
         """Test that a given key is deleted."""