/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/per_workingtree/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-20 02:02:23 UTC
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200720020223-7138c14pjoodkq5y
Fix imports of sixish.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_transform.py
48
48
    file_kind,
49
49
    pathjoin,
50
50
)
51
 
from ...sixish import (
52
 
    text_type,
53
 
    )
54
51
from .. import (
55
52
    features,
56
53
    TestSkipped,
897
894
        raw_conflicts = resolve_conflicts(tt)
898
895
        cooked_conflicts = cook_conflicts(raw_conflicts, tt)
899
896
        tt.finalize()
900
 
        conflicts_s = [text_type(c) for c in cooked_conflicts]
 
897
        conflicts_s = [str(c) for c in cooked_conflicts]
901
898
        self.assertEqual(len(cooked_conflicts), len(conflicts_s))
902
899
        self.assertEqual(conflicts_s[0], 'Conflict adding file dorothy.  '
903
900
                                         'Moved existing file to '