Merge lp://qastaging/~mikemc/ubuntuone-control-panel/url-paranoia-1112792 into lp://qastaging/ubuntuone-control-panel
Proposed by
Mike McCracken
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 398 |
| Merged at revision: | 398 |
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-control-panel/url-paranoia-1112792 |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
61 lines (+19/-8) 2 files modified
ubuntuone/controlpanel/utils/darwin.py (+13/-2) ubuntuone/controlpanel/utils/tests/test_darwin.py (+6/-6) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/url-paranoia-1112792 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Use officially recommended API for creating file URLs. (LP: #1112792)
Description of the change
- Use officially recommended API for creating file URLs. (LP: #1112792)
The bug appears to be crashing due to a NULL NSURL.
I can't reproduce it, but the officially recommended API does the URL-encoding for us, and may generate a URL when the other way does not.
Also check for NULL and return cleanly with a log to avoid the crash.
Update test suite, and tweak test suite so it doesn't break when printing broken-
To post a comment you must log in.
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good to me!