Merge lp:~nataliabidart/ubuntu-sso-client/remove-gnomekeyring-from-docs into lp:ubuntu-sso-client

Proposed by Natalia Bidart on 2010-11-24
Status: Merged
Approved by: Alejandro J. Cura on 2010-11-24
Approved revision: 655
Merged at revision: 655
Proposed branch: lp:~nataliabidart/ubuntu-sso-client/remove-gnomekeyring-from-docs
Merge into: lp:ubuntu-sso-client
Diff against target: 39 lines (+4/-3)
3 files modified
ubuntu_sso/keyring.py (+1/-1)
ubuntu_sso/main.py (+1/-1)
ubuntu_sso/tests/test_keyring.py (+2/-1)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu-sso-client/remove-gnomekeyring-from-docs
Reviewer Review Type Date Requested Status
dobey (community) Approve on 2010-11-24
Alejandro J. Cura (community) trivial 2010-11-24 Approve on 2010-11-24
Review via email: mp+41776@code.launchpad.net

Commit Message

* Remove outdated references to gnome keyring from docstrings.

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

trivially approving.

review: Approve (trivial)
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/keyring.py'
2--- ubuntu_sso/keyring.py 2010-11-17 19:37:12 +0000
3+++ ubuntu_sso/keyring.py 2010-11-24 18:19:15 +0000
4@@ -19,7 +19,7 @@
5 # this program; if not, write to the Free Software Foundation, Inc.,
6 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
7
8-"""Handle keys in the gnome kerying."""
9+"""Handle keys in the local kerying."""
10
11 import socket
12 import urllib
13
14=== modified file 'ubuntu_sso/main.py'
15--- ubuntu_sso/main.py 2010-11-24 12:48:28 +0000
16+++ ubuntu_sso/main.py 2010-11-24 18:19:15 +0000
17@@ -23,7 +23,7 @@
18 An utility which accepts requests for Ubuntu Single Sign On login over D-Bus.
19
20 The OAuth process is handled, including adding the OAuth access token to the
21-gnome keyring.
22+local keyring.
23
24 """
25
26
27=== modified file 'ubuntu_sso/tests/test_keyring.py'
28--- ubuntu_sso/tests/test_keyring.py 2010-11-17 19:37:12 +0000
29+++ ubuntu_sso/tests/test_keyring.py 2010-11-24 18:19:15 +0000
30@@ -153,7 +153,8 @@
31
32
33 class TestKeyring(TestCase):
34- """Test the gnome keyring related functions."""
35+ """Test the keyring related functions."""
36+
37 timeout = 5
38
39 def setUp(self):

Subscribers

People subscribed via source and target branches