Merge lp:~gz/brz/i_unzipping into lp:brz
Proposed by
Martin Packman
on 2017-05-24
Status: | Merged |
---|---|
Approved by: | Martin Packman on 2017-05-24 |
Approved revision: | 6634 |
Merge reported by: | The Breezy Bot |
Merged at revision: | not available |
Proposed branch: | lp:~gz/brz/i_unzipping |
Merge into: | lp:brz |
Diff against target: |
451 lines (+52/-56) 15 files modified
breezy/config.py (+1/-2) breezy/index.py (+1/-0) breezy/knit.py (+4/-7) breezy/log.py (+5/-11) breezy/repofmt/knitpack_repo.py (+7/-5) breezy/sixish.py (+2/-1) breezy/tests/__init__.py (+1/-1) breezy/tests/blackbox/test_log.py (+2/-3) breezy/tests/per_controldir/test_controldir.py (+1/-3) breezy/tests/per_repository/test_repository.py (+1/-1) breezy/tests/per_transport.py (+6/-6) breezy/tests/per_versionedfile.py (+7/-6) breezy/transport/sftp.py (+4/-1) breezy/versionedfile.py (+8/-7) breezy/workingtree_4.py (+2/-2) |
To merge this branch: | bzr merge lp:~gz/brz/i_unzipping |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij | 2017-05-24 | Approve on 2017-05-24 | |
Review via email:
|
Commit message
Make use of zip Python 3 compatible
Description of the change
Fix uses of zip and itertools.izip to work across Python 2 and 3.
Using future_builtins in preference to conditional import of izip name.
Did some small refactoring of ancient code while touching things, stuff like knit wants to go away anyway.
To post a comment you must log in.
review:
Approve
The Breezy Bot (the-breezy-bot) wrote : | # |
lp:~gz/brz/i_unzipping
updated
on 2017-05-24
- 6634. By Martin Packman on 2017-05-24
-
Fix per_versionedfile test failures and rethink future_builtins
Martin Packman (gz) wrote : | # |
Fixed test failures from per_versionedfile tests also really needing an iterator. Also reshuffled comments and moved zip and map to commonly importable location.
lp:~gz/brz/i_unzipping
updated
on 2017-05-24
- 6635. By Martin Packman on 2017-05-24
-
Move remaining future_builtins zip imports
Running landing tests failed 10.242. 247.184: 8080/job/ brz-dev/ 3/
http://