/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_4.py

  • Committer: Martin
  • Date: 2017-06-14 23:29:06 UTC
  • mto: This revision was merged to the branch mainline in revision 6698.
  • Revision ID: gzlist@googlemail.com-20170614232906-rcxh4ror0f0uwiof
Remove remaining uses of basestring from the codebase

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/workingtree_4.py
135
135
        """See MutableTree._add."""
136
136
        state = self.current_dirstate()
137
137
        for f, file_id, kind in zip(files, ids, kinds):
138
 
            f = f.strip(b'/')
 
138
            f = f.strip(u'/')
139
139
            if self.path2id(f):
140
140
                # special case tree root handling.
141
141
                if f == b'' and self.path2id(f) == ROOT_ID:
664
664
        if not from_paths:
665
665
            return result
666
666
        state = self.current_dirstate()
667
 
        if isinstance(from_paths, basestring):
 
667
        if isinstance(from_paths, (str, bytes)):
668
668
            raise ValueError()
669
669
        to_dir_utf8 = to_dir.encode('utf8')
670
670
        to_entry_dirname, to_basename = os.path.split(to_dir_utf8)