RESTful Ubuntu One Client

Merge lp:~vds/restful-u1/works_with_lucid into lp:restful-u1

  1. works_with_lucid
  2. Merge into trunk
Proposed by Vincenzo Di Somma
Status: Merged
Approved by: John O'Brien
Approved revision: 16
Merged at revision: 16
Proposed branch: lp:~vds/restful-u1/works_with_lucid
Merge into: lp:restful-u1
Diff against target: 16 lines (+5/-1)
1 file modified
u1rest/lib/auth/gnomeauth.py (+5/-1)
To merge this branch: bzr merge lp:~vds/restful-u1/works_with_lucid
Reviewer Review Type Date Requested Status
John O'Brien Approve
Review via email: mp+65002@code.launchpad.net

Description of the change

Default value for APP_NAME, so it works on lucid too.

To post a comment you must log in.
Revision history for this message
John O'Brien (jdobrien) wrote :

Thanks for this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'u1rest/lib/auth/gnomeauth.py'
2--- u1rest/lib/auth/gnomeauth.py 2011-05-09 21:47:47 +0000
3+++ u1rest/lib/auth/gnomeauth.py 2011-06-17 14:09:24 +0000
4@@ -19,7 +19,11 @@
5 #THE SOFTWARE.
6 """An authenticator based on the Gnome Keyring."""
7 import gobject
8-from ubuntuone.clientdefs import APP_NAME
9+
10+try:
11+ from ubuntuone.clientdefs import APP_NAME
12+except ImportError:
13+ APP_NAME = "Ubuntu One"
14 from ubuntu_sso.main import Credentials
15
16 from u1rest.lib.auth.baseauth import BaseAuthenticator

Subscribers

People subscribed via source and target branches