lp:~mterry/duplicity/2.6isms

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:duplicity/0.6 at revision 975

duplicity-team: Pending requested 2014-04-17

Diff: 1807 lines (+259/-196)

46 files modified

bin/duplicity (+7/-7)
bin/rdiffdir (+1/-1)
duplicity/backend.py (+4/-4)
duplicity/backends/_boto_multi.py (+4/-4)
duplicity/backends/_boto_single.py (+8/-8)
duplicity/backends/_cf_cloudfiles.py (+13/-13)
duplicity/backends/_cf_pyrax.py (+13/-13)
duplicity/backends/_ssh_paramiko.py (+20/-20)
duplicity/backends/botobackend.py (+2/-2)
duplicity/backends/cfbackend.py (+2/-2)
duplicity/backends/dpbxbackend.py (+6/-5)
duplicity/backends/gdocsbackend.py (+7/-7)
duplicity/backends/giobackend.py (+6/-6)
duplicity/backends/imapbackend.py (+1/-1)
duplicity/backends/localbackend.py (+6/-6)
duplicity/backends/megabackend.py (+6/-6)
duplicity/backends/sshbackend.py (+2/-2)
duplicity/backends/swiftbackend.py (+17/-17)
duplicity/backends/webdavbackend.py (+5/-5)
duplicity/cached_ops.py (+1/-1)
duplicity/collections.py (+3/-3)
duplicity/commandline.py (+1/-1)
duplicity/diffdir.py (+4/-4)
duplicity/dup_temp.py (+3/-3)
duplicity/dup_threading.py (+2/-2)
duplicity/dup_time.py (+4/-4)
duplicity/file_naming.py (+1/-1)
duplicity/globals.py (+1/-1)
duplicity/gpg.py (+1/-1)
duplicity/gpginterface.py (+9/-9)
duplicity/librsync.py (+7/-7)
duplicity/patchdir.py (+1/-1)
duplicity/path.py (+1/-1)
duplicity/progress.py (+2/-2)
duplicity/robust.py (+1/-1)
duplicity/selection.py (+2/-2)
duplicity/statistics.py (+3/-3)
duplicity/tempdir.py (+1/-1)
duplicity/util.py (+2/-2)
testing/tests/test_badupload.py (+1/-1)
testing/tests/test_collections.py (+4/-4)
testing/tests/test_filenaming.py (+4/-4)
testing/tests/test_lazy.py (+2/-1)
testing/tests/test_patchdir.py (+6/-6)
testing/tests/test_python3.py (+61/-0)
testing/tests/test_restart.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

993. By Michael Terry on 2014-04-17

Fix subprocess usage to work in py2.6 and fix a missing unicode

992. By Michael Terry on 2014-04-17

Solve has_key 2to3 fix

991. By Michael Terry on 2014-04-17

Move imports fix to the 'don't care' section

990. By Michael Terry on 2014-04-17

Solve import 2to3 fix

989. By Michael Terry on 2014-04-17

Solve numliterals 2to3 fix

988. By Michael Terry on 2014-04-17

Solve long 2to3 fix

987. By Michael Terry on 2014-04-17

Move urllib fix to the 'don't care' section

986. By Michael Terry on 2014-04-17

Solve basestring 2to3 fix

985. By Michael Terry on 2014-04-17

Move long and raw_input fixes to the 'don't care' section

984. By Michael Terry on 2014-04-17

Solve reduce 2to3 fix