desktopcouch

Merge lp://qastaging/~sil/desktopcouch/fix-pairing-oauth-again into lp://qastaging/desktopcouch

  1. fix-pairing-oauth-again
  2. Merge into trunk
Proposed by Stuart Langridge
Status: Merged
Approved by: John O'Brien
Approved revision: 69
Merged at revision: not available
Proposed branch: lp://qastaging/~sil/desktopcouch/fix-pairing-oauth-again
Merge into: lp://qastaging/desktopcouch
Diff against target: 12 lines
1 file modified
bin/desktopcouch-pair (+1/-1)
To merge this branch: bzr merge lp://qastaging/~sil/desktopcouch/fix-pairing-oauth-again
Reviewer Review Type Date Requested Status
John O'Brien (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+12332@code.qastaging.launchpad.net

Commit message

Use get_oauth_data() because API changed from oauth_data()

To post a comment you must log in.
Revision history for this message
Stuart Langridge (sil) wrote :

Use get_oauth_data() because API changed from oauth_data() to get_oauth_data()

Revision history for this message
Eric Casteleijn (thisfred) wrote :

Works now, tests still pass, trivial change, so I'm approving

review: Approve
Revision history for this message
John O'Brien (jdobrien) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/desktopcouch-pair'
2--- bin/desktopcouch-pair 2009-09-14 16:06:52 +0000
3+++ bin/desktopcouch-pair 2009-09-24 08:20:23 +0000
4@@ -820,7 +820,7 @@
5 try:
6 import desktopcouch.replication_services as services
7 srv = getattr(services, service_name)
8- oauth_data = srv.oauth_data()
9+ oauth_data = srv.get_oauth_data()
10 result = couchdb_io.put_static_paired_service(oauth_data, service_name)
11 assert result != None
12 except Exception, e:

Subscribers

People subscribed via source and target branches