Merge lp:~nataliabidart/ubuntu-sso-client/restore-no-access-token into lp:ubuntu-sso-client

Proposed by Natalia Bidart
Status: Merged
Approved by: John Lenton
Approved revision: 621
Merged at revision: 619
Proposed branch: lp:~nataliabidart/ubuntu-sso-client/restore-no-access-token
Merge into: lp:ubuntu-sso-client
Diff against target: 44 lines (+27/-0)
2 files modified
ubuntu_sso/__init__.py (+2/-0)
ubuntu_sso/auth.py (+25/-0)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu-sso-client/restore-no-access-token
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Roman Yepishev (community) code Approve
Review via email: mp+34862@code.launchpad.net

Commit message

Restoring NoAccessToken, DBUS_IFACE_AUTH_NAME, and DBUS_PATH_AUTH to avoid API breakage on old versions of ubuntuone-client (LP: #633220).

Description of the change

Restoring NoAccessToken, DBUS_IFACE_AUTH_NAME, and DBUS_PATH_AUTH to avoid API breakage on old versions of ubuntuone-client.

To post a comment you must log in.
619. By Natalia Bidart

Fixes bug (LP: #633220).

620. By Natalia Bidart

Lint fixes.

621. By Natalia Bidart

IMproving auth module docstring to be explicit about its obsoleteness.

Revision history for this message
Roman Yepishev (rye) wrote :

Looks good

review: Approve (code)
Revision history for this message
John Lenton (chipaca) wrote :

I'd've said something as to the why it's included even though obsolete. But OK :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/__init__.py'
2--- ubuntu_sso/__init__.py 2010-09-02 16:41:05 +0000
3+++ ubuntu_sso/__init__.py 2010-09-08 17:43:41 +0000
4@@ -16,8 +16,10 @@
5 """Ubuntu Single Sign On client code."""
6
7 # constants
8+DBUS_PATH_AUTH = "/"
9 DBUS_BUS_NAME = "com.ubuntu.sso"
10 DBUS_PATH = "/sso"
11 DBUS_CRED_PATH = "/credentials"
12+DBUS_IFACE_AUTH_NAME = "com.ubuntu.sso"
13 DBUS_IFACE_USER_NAME = "com.ubuntu.sso.UserManagement"
14 DBUS_IFACE_CRED_NAME = "com.ubuntu.sso.ApplicationCredentials"
15
16=== added file 'ubuntu_sso/auth.py'
17--- ubuntu_sso/auth.py 1970-01-01 00:00:00 +0000
18+++ ubuntu_sso/auth.py 2010-09-08 17:43:41 +0000
19@@ -0,0 +1,25 @@
20+# ubuntu_sso.auth - Client authorization module
21+#
22+# Author: Stuart Langridge <stuart.langridge@canonical.com>
23+#
24+# Copyright 2009 Canonical Ltd.
25+#
26+# This program is free software: you can redistribute it and/or modify it
27+# under the terms of the GNU General Public License version 3, as published
28+# by the Free Software Foundation.
29+#
30+# This program is distributed in the hope that it will be useful, but
31+# WITHOUT ANY WARRANTY; without even the implied warranties of
32+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
33+# PURPOSE. See the GNU General Public License for more details.
34+#
35+# You should have received a copy of the GNU General Public License along
36+# with this program. If not, see <http://www.gnu.org/licenses/>.
37+"""This is an obsolete module.
38+
39+Do not use it, use the DBus API from main instead (SSOCredentials).
40+"""
41+
42+
43+class NoAccessToken(Exception):
44+ """No access token available."""

Subscribers

People subscribed via source and target branches