Merge lp://qastaging/~mterry/duplicity/gio-pydrive-fsdecode into lp://qastaging/~duplicity-team/duplicity/0.8-series

Proposed by Michael Terry
Status: Merged
Merged at revision: 1370
Proposed branch: lp://qastaging/~mterry/duplicity/gio-pydrive-fsdecode
Merge into: lp://qastaging/~duplicity-team/duplicity/0.8-series
Diff against target: 99 lines (+16/-10)
2 files modified
duplicity/backends/giobackend.py (+4/-4)
duplicity/backends/pydrivebackend.py (+12/-6)
To merge this branch: bzr merge lp://qastaging/~mterry/duplicity/gio-pydrive-fsdecode
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+368101@code.qastaging.launchpad.net

Commit message

Fix gio and pydrive backends to use fsdecode

Description of the change

It looks like the gio and pydrive backends have some issues in 0.8.00.

If I'm gathering correctly, backends are given byte string filenames. Both those backends' libraries were expecting unicode, so we have to decode first.

I also added some missing exception imports in pydrive.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches