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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-21 23:59:28 UTC
  • mfrom: (6973.6.4 python3-e)
  • Revision ID: jelmer@jelmer.uk-20180621235928-f7z0vf0lxc6ieo9e
Merge lp:~jelmer/brz/python3-e

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tree.py
44
44
    )
45
45
from .inter import InterObject
46
46
from .sixish import (
 
47
    text_type,
47
48
    viewvalues,
48
49
    )
49
50
 
1163
1164
        # This is stolen from _dirstate_helpers_py.py, only switching it to
1164
1165
        # Unicode objects. Consider using encode_utf8() and then using the
1165
1166
        # optimized versions, or maybe writing optimized unicode versions.
1166
 
        if not isinstance(path1, unicode):
 
1167
        if not isinstance(path1, text_type):
1167
1168
            raise TypeError("'path1' must be a unicode string, not %s: %r"
1168
1169
                            % (type(path1), path1))
1169
 
        if not isinstance(path2, unicode):
 
1170
        if not isinstance(path2, text_type):
1170
1171
            raise TypeError("'path2' must be a unicode string, not %s: %r"
1171
1172
                            % (type(path2), path2))
1172
1173
        return cmp(MultiWalker._path_to_key(path1),