lp:~aaron-whitehouse/duplicity/08-python-futurize-stage-1

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~duplicity-team/duplicity/0.8-series at revision 1177

duplicity-team: Pending requested 2017-02-11

Diff: 557 lines (+86/-61)

13 files modified

duplicity/collections.py (+8/-2)
duplicity/commandline.py (+2/-1)
duplicity/diffdir.py (+6/-6)
duplicity/dup_time.py (+10/-3)
duplicity/gpg.py (+3/-3)
duplicity/lazy.py (+14/-13)
duplicity/patchdir.py (+8/-8)
duplicity/selection.py (+1/-1)
setup.py (+4/-2)
testing/unit/test_collections.py (+4/-3)
testing/unit/test_diffdir.py (+16/-15)
testing/unit/test_dup_time.py (+7/-1)
testing/unit/test_lazy.py (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1172. By Aaron Whitehouse on 2017-02-11

Update setup.py to show only Python 2.7 support.

1171. By Aaron Whitehouse on 2017-02-11

Merge changes from trunk

1170. By Aaron Whitehouse on 2017-01-19

* Futurize -stage1 all files, leaving the isinstance(s, types.StringType) tests unchanged.
* Reverted earlier changes to types.StringType test in test files.
* Created python 2/3 compatible tests for int and long.

1169. By Aaron Whitehouse on 2017-01-18

Futurize -stage1 on py files in testing for improved python 2/3 support.

1168. By Kenneth Loafman on 2017-01-16

* Merged in lp:~aaron-whitehouse/duplicity/0-8-merge_selection_tests
  - Merge in TestExcludeIfPresent from 0.7-series, which tests the behaviour of
    duplicity's --exclude-if-present option.
  - Move and rename TestTrailingSlash2 test (was duplicate name) as in 0.7-series.
  - Fix PEP error on adbackend.py.
  - Add jottalib as a tox dep to fix pylint error.
  - Remove unnecessary skipUnless Linux as per 0.7-series.

1167. By Kenneth Loafman on 2017-01-16

* Fixed bug #1654220 with patch supplied by Kenneth Newwood
  - Duplicity fails on MacOS because GPG version parsing fails

1166. By Kenneth Loafman on 2017-01-16

* Fixed bug #1623342 with patch supplied by Daniel Jakots
  - Failing test on OpenBSD because tar/gtar not found

1165. By Kenneth Loafman on 2016-12-29

* Merged in lp:~breunigs/duplicity/amazondrive3
  - As reported on the mailinglist, if a space is entered while duplicity asks for the URL, it fails.
    Since all important spaces are URL encoded anyway, this should be fine even if there are spaces in
    the URL at all. I also patched it in the onedrive backend, because it must have similar issues.

1164. By Kenneth Loafman on 2016-12-29

* Fix Bug #1642813 with patch from Ravi
  - If stat() returns None, don't attempt to set perms.

1163. By Kenneth Loafman on 2016-12-26

Whoops, make a couple of changes to match series-7.