~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Martin Pool
  • Date: 2005-04-15 07:53:59 UTC
  • Revision ID: mbp@sourcefrog.net-20050415075359-e45b9cdcefc06fc8
- Windows path fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
343
343
            yield name, ie
344
344
            if ie.kind == 'directory':
345
345
                for cn, cie in self.iter_entries(from_dir=ie.file_id):
346
 
                    yield '/'.join((name, cn)), cie
 
346
                    yield os.path.join(name, cn), cie
347
347
                    
348
348
 
349
349
 
555
555
 
556
556
        # get all names, skipping root
557
557
        p = [self[fid].name for fid in self.get_idpath(file_id)[1:]]
558
 
        return '/'.join(p)
 
558
        return os.sep.join(p)
559
559
            
560
560
 
561
561