Merge lp:~dobey/ubuntuone-storage-protocol/update-4-2 into lp:ubuntuone-storage-protocol/stable-4-2

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 161
Merged at revision: 161
Proposed branch: lp:~dobey/ubuntuone-storage-protocol/update-4-2
Merge into: lp:ubuntuone-storage-protocol/stable-4-2
Diff against target: 12 lines (+1/-1)
1 file modified
ubuntuone/storageprotocol/client.py (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-storage-protocol/update-4-2
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+155607@code.launchpad.net

Commit message

[Rodney Dawes]

    Use http instead of server to work around urlparse giving incorrect results.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ubuntuone/storageprotocol/client.py'
--- ubuntuone/storageprotocol/client.py 2013-02-07 21:43:42 +0000
+++ ubuntuone/storageprotocol/client.py 2013-03-26 20:38:33 +0000
@@ -162,7 +162,7 @@
162 signature_method=SIGNATURE_PLAINTEXT,162 signature_method=SIGNATURE_PLAINTEXT,
163 signature_type=SIGNATURE_TYPE_QUERY,163 signature_type=SIGNATURE_TYPE_QUERY,
164 timestamp=timestamp)164 timestamp=timestamp)
165 url, headers, body = client.sign('storage://server')165 url, headers, body = client.sign('http://server')
166 # Parse out the authentication parameters from the query string.166 # Parse out the authentication parameters from the query string.
167 auth_parameters = dict(167 auth_parameters = dict(
168 (name, value) for name, value in168 (name, value) for name, value in

Subscribers

People subscribed via source and target branches

to all changes: