Merge lp:~nataliabidart/ubuntuone-client/make-it-work into lp:ubuntuone-client

Proposed by Natalia Bidart on 2012-01-06
Status: Merged
Approved by: Natalia Bidart on 2012-01-12
Approved revision: 1177
Merged at revision: 1178
Proposed branch: lp:~nataliabidart/ubuntuone-client/make-it-work
Merge into: lp:ubuntuone-client
Diff against target: 32 lines (+3/-8)
1 file modified
ubuntuone/platform/credentials/windows.py (+3/-8)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-client/make-it-work
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve on 2012-01-12
Alejandro J. Cura (community) 2012-01-06 Approve on 2012-01-11
Review via email: mp+87767@code.launchpad.net

Commit Message

- Use latest SSO interface.

To post a comment you must log in.
Alejandro J. Cura (alecu) wrote :

Tested IRL on windows, and ran unit tests: works as advertised!

review: Approve
Manuel de la Peña (mandel) wrote :

Ran tests on linux all pass, ran tests on windows and only those failures already present in trunk are seen, therefore +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/platform/credentials/windows.py'
2--- ubuntuone/platform/credentials/windows.py 2011-09-13 19:31:23 +0000
3+++ ubuntuone/platform/credentials/windows.py 2012-01-06 15:41:12 +0000
4@@ -1,8 +1,5 @@
5 # -*- coding: utf-8 -*-
6 #
7-# Authors: Manuel de la Pena <manuel@canonical.com>
8-# Alejandro J. Cura <alecu@canonical.com>
9-#
10 # Copyright 2011 Canonical Ltd.
11 #
12 # This program is free software: you can redistribute it and/or modify it
13@@ -19,7 +16,7 @@
14 """Ubuntu One credentials management IPC service."""
15
16
17-from ubuntu_sso.main.windows import UbuntuSSOClient
18+from ubuntu_sso.main import get_sso_client
19 from twisted.internet import defer
20
21 from ubuntu_sso.credentials import (
22@@ -168,8 +165,6 @@
23 @defer.inlineCallbacks
24 def get_creds_proxy():
25 """Get the CredentialsManagement proxy."""
26- client = UbuntuSSOClient()
27- yield client.connect()
28- yield client.cred_management.register_to_signals()
29- result = CredentialsManagement(client.cred_management)
30+ client = yield get_sso_client()
31+ result = CredentialsManagement(client.cred_manager)
32 defer.returnValue(result)

Subscribers

People subscribed via source and target branches