lp:~mterry/duplicity/py3-map-filter

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:duplicity/0.6 at revision 980

duplicity-team: Pending requested 2014-04-25

Diff: 570 lines (+79/-64)

22 files modified

duplicity/backend.py (+1/-1)
duplicity/backends/_boto_single.py (+1/-1)
duplicity/backends/_ssh_pexpect.py (+1/-1)
duplicity/backends/ftpbackend.py (+1/-2)
duplicity/backends/ftpsbackend.py (+1/-2)
duplicity/backends/hsibackend.py (+1/-2)
duplicity/backends/rsyncbackend.py (+1/-1)
duplicity/collections.py (+21/-20)
duplicity/commandline.py (+2/-0)
duplicity/diffdir.py (+6/-5)
duplicity/dup_time.py (+2/-0)
duplicity/manifest.py (+2/-0)
duplicity/patchdir.py (+4/-3)
duplicity/path.py (+2/-0)
duplicity/selection.py (+7/-6)
duplicity/statistics.py (+3/-2)
duplicity/util.py (+2/-0)
testing/functional/__init__.py (+2/-0)
testing/test_code.py (+3/-5)
testing/unit/test_collections.py (+5/-5)
testing/unit/test_diffdir.py (+4/-3)
testing/unit/test_patchdir.py (+7/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

980. By Michael Terry on 2014-04-25

Fix map usage for py3 readiness

979. By Michael Terry on 2014-04-25

Fix filter usage for py3 readiness

978. By Kenneth Loafman on 2014-04-20

# Merged in lp:~mterry/duplicity/more-test-reorg
  - Here's another test reorganization / modernization branch. It does the
    following things:
    - Drop duplicity/misc.py. It is confusing to have both misc.py and util.py,
      and most of the code in misc.py was no longer used. I moved the one
      function that was still used into util.py.
    - Consolidated the various ways to run tests into just one. I made tox runs
      go through ./setup.py test, rather than nosetests. And I made the
      ./testing/run-tests scripts just call tox. Now we no longer need nosetests
      as a test dependency (although you can still use it if you want).
    - Added two more code quality automated tests: a pep8 one and a pylint one.
      I disabled almost all checks in each program that gave a warning. These
      tests just establish a baseline for future improvement.
    - Moved the test helper code into TestCase subclasses that all tests can
      use. And used more code sharing and setUp/tearDown cleverness to remove
      duplicated code.
    - Reorganized the tests in ./testing/tests into ./testing/functional and
      ./testing/unit -- for whether they drive duplicity as a subprocess or
      whether they import and test code directly. Each dir can have specialized
      TestCase subclasses now.
    - Renamed the files in ./testing/unit to more clearly indicate which file
      in ./duplicity they are unit testing.
    - Added some helper methods for tests to set environment and globals.*
      parameters more safely (i.e. without affecting other tests) by
      automatically cleaning up any such changes during test tearDown.
    - Removed test_unicode.py, since it is kind of dumb. It used to be more
      useful, but now with py2.6, we are just testing that one line of code
      in it is actually there.

977. By Kenneth Loafman on 2014-04-19

* Merged in lp:~mterry/duplicity/encode-for-print
  - Encode translated strings before passing them to 'print'.
  - The print command can only apparently handle bytes. So when we pass it
    unicode, it freaks out. There were only four instances I saw where we used
    print, so I figured it was easiest to just convert them to use the log
    framework too.
  - That way all user-visible strings go through that framework and are subject
    to the same encoding rules.

976. By Kenneth Loafman on 2014-04-19

* Merged in lp:~mterry/duplicity/drop-static
  - Drop static.py.
  - This is some of the oldest code in duplicity! A bzr blame says it is
    unmodified (except for whitespace / comment changes) since revision 1.
  - But it's not needed anymore. Not really even since we updated to python2.4,
    which introduced the @staticmethod decorator. So this branch drops it and
    its test file.

975. By Kenneth Loafman on 2014-04-19

* Merged in lp:~mterry/duplicity/2.6isms
  - Here's a whole stack of minor syntax modernizations that will become
    necessary in python3. They all work in python2.6.
  - I've added a new test to keep us honest and prevent backsliding on these
    modernizations. It runs 2to3 and will fail the test if 2to3 finds anything
    that needs fixing (with a specific set of exceptions carved out).
  - This branch has most of the easy 2to3 fixes, the ones with obvious and
    safe syntax changes.
  - We could just let 2to3 do them for us, but ideally we use 2to3 as little
    as possible, since it doesn't always know how to solve a given problem.
    I will propose a branch later that actually does use 2to3 to generate
    python3 versions of duplicity if they are requested. But this is a first
    step to clean up the code base.

974. By Kenneth Loafman on 2014-04-17

* Merged in lp:~mterry/duplicity/drop-pexpect
  - Drop our local copy of pexpect in favor of a system version.
  - It's only used by the pexpect ssh backend (and if you're opting into that,
    you probably can expect that you will need pexpect) and the tests.
  - I've done a quick smoketest (backed up and restored using
    --ssh-backend=pexpect) and it seemed to work fine with a modern version
    of pexpect.

973. By Kenneth Loafman on 2014-04-17

* Merged in lp:~mterry/duplicity/fix-drop-u1
  - Looks like when the drop-u1 branch got merged, its conflict got resolved
    badly. Here is the right version of backend.py to use (and also drops
    u1backend.py from POTFILES).

972. By Kenneth Loafman on 2014-04-17

* Merged in lp:~mterry/duplicity/drop-u1
  - Ubuntu One is closing shop. So no need to support a u1 backend anymore.

971. By Kenneth Loafman on 2014-04-17

* Merged in lp:~mterry/duplicity/require-2.6
  - Require at least Python 2.6.
  - Our code base already requires 2.6, because 2.6-isms have crept in. Usually
    because we or a contributor didn't think to test with 2.4. And frankly,
    I'm not even sure how to test with 2.4 on a modern system.