/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/bzr/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-08-26 01:29:46 UTC
  • mto: This revision was merged to the branch mainline in revision 7103.
  • Revision ID: jelmer@jelmer.uk-20180826012946-59p0yim5saahv66h
Fix bad fs tests on Python 3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/workingtree.py
1480
1480
                continue
1481
1481
 
1482
1482
            fl = []
1483
 
            for subf in os.listdir(dirabs):
 
1483
            for subf in os.listdir(dirabs.encode(osutils._fs_enc)):
 
1484
                try:
 
1485
                    subf = subf.decode(osutils._fs_enc)
 
1486
                except UnicodeDecodeError:
 
1487
                    path_os_enc = path.encode(osutils._fs_enc)
 
1488
                    relpath = path_os_enc + b'/' + subf
 
1489
                    raise errors.BadFilenameEncoding(relpath,
 
1490
                                                     osutils._fs_enc)
 
1491
 
1484
1492
                if self.controldir.is_control_filename(subf):
1485
1493
                    continue
1486
1494
                if subf not in dir_entry.children: