/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/tests/test_transform.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/tests/test_transform.py
61
61
from ..mutabletree import MutableTree
62
62
from ..sixish import (
63
63
    BytesIO,
 
64
    text_type,
64
65
    )
65
66
from . import (
66
67
    features,
877
878
        raw_conflicts = resolve_conflicts(tt)
878
879
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
879
880
        tt.finalize()
880
 
        conflicts_s = [unicode(c) for c in cooked_conflicts]
 
881
        conflicts_s = [text_type(c) for c in cooked_conflicts]
881
882
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
882
883
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
883
884
                                         'Moved existing file to '