Merge lp:~jelmer/brz/bad-fs-python3 into lp:brz
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij on 2018-09-11 |
Approved revision: | 7081 |
Merge reported by: | The Breezy Bot |
Merged at revision: | not available |
Proposed branch: | lp:~jelmer/brz/bad-fs-python3 |
Merge into: | lp:brz |
Diff against target: |
75 lines (+22/-4) 3 files modified
breezy/bzr/workingtree.py (+9/-1) breezy/osutils.py (+7/-3) python3.passing (+6/-0) |
To merge this branch: | bzr merge lp:~jelmer/brz/bad-fs-python3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman | 2018-08-26 | Approve on 2018-09-10 | |
Review via email:
|
Commit message
Fix bad fs encoding tests on python 3.
Description of the change
Fix bad fs encoding tests on python 3.
When calling os.listdir(), pass in a bytestring for the filename.
When passing in a unicode string, and if sys.getfilesyte
Martin Packman (gz) wrote : | # |
Martin Packman (gz) wrote : | # |
Okay, I think this code is wrong in several circumstances, but:
1) There is a windows specific dirreader already at least
2) Fixing it should probably replace the interfaces with something better anyway
So, lets land, and follow up separately to work out some better cross-platform filesystem abstractions despite the mess that Python 3 made of this.
The Breezy Bot (the-breezy-bot) wrote : | # |
Running landing tests failed
https:/
The Breezy Bot (the-breezy-bot) wrote : | # |
Merging failed
https:/
- 7081. By Jelmer Vernooij on 2018-09-11
-
Merge trunk
Not sure about this, on Windows (and -ish on Macs) we're better off using unicode for filesystem operations, it's nix that gets into a mess with surrogateescape due to really being bytes underneath.