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

  • Committer: Jelmer Vernooij
  • Date: 2020-02-07 02:14:30 UTC
  • mto: This revision was merged to the branch mainline in revision 7492.
  • Revision ID: jelmer@jelmer.uk-20200207021430-m49iq3x4x8xlib6x
Drop python2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_xml.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from io import BytesIO
17
18
 
18
19
from .. import (
19
20
    errors,
25
26
    xml7,
26
27
    xml8,
27
28
    )
28
 
from ..sixish import (
29
 
    BytesIO,
30
 
    text_type,
31
 
    )
32
29
from ..bzr.inventory import Inventory
33
30
from . import TestCase
34
31
import breezy.bzr.xml5
491
488
        for parent_id in rev.parent_ids:
492
489
            self.assertIsInstance(parent_id, bytes)
493
490
        self.assertEqual(u'Include \xb5nicode characters\n', rev.message)
494
 
        self.assertIsInstance(rev.message, text_type)
 
491
        self.assertIsInstance(rev.message, str)
495
492
 
496
493
        # ie.revision should either be None or a utf-8 revision id
497
494
        inv = s_v5.read_inventory_from_lines(breezy.osutils.split_lines(_inventory_utf8_v5))
513
510
        for ((exp_path, exp_file_id, exp_parent_id, exp_rev_id),
514
511
             (act_path, act_ie)) in zip(expected, actual):
515
512
            self.assertEqual(exp_path, act_path)
516
 
            self.assertIsInstance(act_path, text_type)
 
513
            self.assertIsInstance(act_path, str)
517
514
            self.assertEqual(exp_file_id, act_ie.file_id)
518
515
            self.assertIsInstance(act_ie.file_id, bytes)
519
516
            self.assertEqual(exp_parent_id, act_ie.parent_id)