/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: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_xml.py
27
27
    )
28
28
from ..sixish import (
29
29
    BytesIO,
30
 
    text_type,
31
30
    )
32
31
from ..bzr.inventory import Inventory
33
32
from . import TestCase
170
169
</revision>
171
170
"""
172
171
 
173
 
_expected_rev_v8_complex = b"""<revision committer="Erik B&#229;gfors &lt;erik@foo.net&gt;" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="erik@b&#229;gfors-02" timestamp="1125907235.212" timezone="36000">
174
 
<message>Include &#181;nicode characters
175
 
</message>
176
 
<parents>
177
 
<revision_ref revision_id="erik@b&#229;gfors-01" />
178
 
<revision_ref revision_id="erik@bagfors-02" />
179
 
</parents>
180
 
<properties><property name="bar" />
181
 
<property name="foo">this has a
182
 
newline in it</property>
183
 
</properties>
184
 
</revision>
185
 
"""
186
 
 
187
 
 
188
 
 
189
172
_inventory_utf8_v5 = b"""<inventory file_id="TRE&#233;_ROOT" format="5"
190
173
                                   revision_id="erik@b&#229;gfors-02">
191
174
<file file_id="b&#229;r-01"
225
208
        eq(len(rev.parent_ids), 1)
226
209
        eq(rev.timezone, 36000)
227
210
        eq(rev.parent_ids[0],
228
 
           b"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
 
211
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
229
212
 
230
213
    def test_unpack_revision_5_utc(self):
231
214
        inp = BytesIO(_revision_v5_utc)
236
219
        eq(len(rev.parent_ids), 1)
237
220
        eq(rev.timezone, 0)
238
221
        eq(rev.parent_ids[0],
239
 
           b"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
 
222
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
240
223
 
241
224
    def test_unpack_inventory_5(self):
242
225
        """Unpack canned new-style inventory"""
244
227
        inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
245
228
        eq = self.assertEqual
246
229
        eq(len(inv), 4)
247
 
        ie = inv.get_entry(b'bar-20050824000535-6bc48cfad47ed134')
 
230
        ie = inv.get_entry('bar-20050824000535-6bc48cfad47ed134')
248
231
        eq(ie.kind, 'file')
249
 
        eq(ie.revision, b'mbp@foo-00')
 
232
        eq(ie.revision, 'mbp@foo-00')
250
233
        eq(ie.name, 'bar')
251
234
        eq(inv.get_entry(ie.parent_id).kind, 'directory')
252
235
 
253
236
    def test_unpack_basis_inventory_5(self):
254
237
        """Unpack canned new-style inventory"""
255
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
256
 
            breezy.osutils.split_lines(_basis_inv_v5))
 
238
        inp = BytesIO(_basis_inv_v5)
 
239
        inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
257
240
        eq = self.assertEqual
258
241
        eq(len(inv), 4)
259
 
        eq(inv.revision_id,
260
 
           b'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
261
 
        ie = inv.get_entry(b'bar-20050824000535-6bc48cfad47ed134')
 
242
        eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
 
243
        ie = inv.get_entry('bar-20050824000535-6bc48cfad47ed134')
262
244
        eq(ie.kind, 'file')
263
 
        eq(ie.revision, b'mbp@foo-00')
 
245
        eq(ie.revision, 'mbp@foo-00')
264
246
        eq(ie.name, 'bar')
265
247
        eq(inv.get_entry(ie.parent_id).kind, 'directory')
266
248
 
267
249
    def test_unpack_inventory_5a(self):
268
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
269
 
            breezy.osutils.split_lines(_inventory_v5a), revision_id=b'test-rev-id')
270
 
        self.assertEqual(b'test-rev-id', inv.root.revision)
 
250
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
 
251
                _inventory_v5a, revision_id='test-rev-id')
 
252
        self.assertEqual('test-rev-id', inv.root.revision)
271
253
 
272
254
    def test_unpack_inventory_5a_cache_and_copy(self):
273
255
        # Passing an entry_cache should get populated with the objects
274
256
        # But the returned objects should be copies if return_from_cache is
275
257
        # False
276
258
        entry_cache = fifo_cache.FIFOCache()
277
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
278
 
            breezy.osutils.split_lines(_inventory_v5a), revision_id=b'test-rev-id',
 
259
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
 
260
            _inventory_v5a, revision_id='test-rev-id',
279
261
            entry_cache=entry_cache, return_from_cache=False)
280
262
        for entry in inv.iter_just_entries():
281
263
            key = (entry.file_id, entry.revision)
290
272
        # The returned objects should be exact if return_from_cache is
291
273
        # True
292
274
        entry_cache = fifo_cache.FIFOCache()
293
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
294
 
            breezy.osutils.split_lines(_inventory_v5a), revision_id=b'test-rev-id',
 
275
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
 
276
            _inventory_v5a, revision_id='test-rev-id',
295
277
            entry_cache=entry_cache, return_from_cache=True)
296
278
        for entry in inv.iter_just_entries():
297
279
            key = (entry.file_id, entry.revision)
302
284
                self.assertIs(entry, entry_cache[key])
303
285
 
304
286
    def test_unpack_inventory_5b(self):
305
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
306
 
            breezy.osutils.split_lines(_inventory_v5b), revision_id=b'test-rev-id')
307
 
        self.assertEqual(b'a-rev-id', inv.root.revision)
 
287
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
 
288
                _inventory_v5b, revision_id='test-rev-id')
 
289
        self.assertEqual('a-rev-id', inv.root.revision)
308
290
 
309
291
    def test_repack_inventory_5(self):
310
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
311
 
            breezy.osutils.split_lines(_committed_inv_v5))
 
292
        inp = BytesIO(_committed_inv_v5)
 
293
        inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
312
294
        outp = BytesIO()
313
295
        breezy.bzr.xml5.serializer_v5.write_inventory(inv, outp)
314
296
        self.assertEqualDiff(_expected_inv_v5, outp.getvalue())
315
 
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
316
 
            breezy.osutils.split_lines(outp.getvalue()))
 
297
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(BytesIO(outp.getvalue()))
317
298
        self.assertEqual(inv, inv2)
318
299
 
319
300
    def assertRoundTrips(self, xml_string):
325
306
        lines = breezy.bzr.xml5.serializer_v5.write_inventory_to_lines(inv)
326
307
        outp.seek(0)
327
308
        self.assertEqual(outp.readlines(), lines)
328
 
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(
329
 
            BytesIO(outp.getvalue()))
 
309
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(BytesIO(outp.getvalue()))
330
310
        self.assertEqual(inv, inv2)
331
311
 
332
312
    def tests_serialize_inventory_v5_with_root(self):
336
316
        """Check that repacking a revision yields the same information"""
337
317
        inp = BytesIO(txt)
338
318
        rev = breezy.bzr.xml5.serializer_v5.read_revision(inp)
339
 
        outfile_contents = breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev)
340
 
        rev2 = breezy.bzr.xml5.serializer_v5.read_revision(
341
 
            BytesIO(outfile_contents))
 
319
        outp = BytesIO()
 
320
        breezy.bzr.xml5.serializer_v5.write_revision(rev, outp)
 
321
        outfile_contents = outp.getvalue()
 
322
        rev2 = breezy.bzr.xml5.serializer_v5.read_revision(BytesIO(outfile_contents))
342
323
        self.assertEqual(rev, rev2)
343
324
 
344
325
    def test_repack_revision_5(self):
351
332
    def test_pack_revision_5(self):
352
333
        """Pack revision to XML v5"""
353
334
        # fixed 20051025, revisions should have final newline
354
 
        rev = breezy.bzr.xml5.serializer_v5.read_revision_from_string(
355
 
            _revision_v5)
356
 
        outfile_contents = breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev)
357
 
        self.assertEqual(outfile_contents[-1:], b'\n')
358
 
        self.assertEqualDiff(
359
 
            outfile_contents,
360
 
            b''.join(breezy.bzr.xml5.serializer_v5.write_revision_to_lines(rev)))
 
335
        rev = breezy.bzr.xml5.serializer_v5.read_revision_from_string(_revision_v5)
 
336
        outp = BytesIO()
 
337
        breezy.bzr.xml5.serializer_v5.write_revision(rev, outp)
 
338
        outfile_contents = outp.getvalue()
 
339
        self.assertEqual(outfile_contents[-1], '\n')
 
340
        self.assertEqualDiff(outfile_contents, breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev))
361
341
        self.assertEqualDiff(outfile_contents, _expected_rev_v5)
362
342
 
363
343
    def test_empty_property_value(self):
364
344
        """Create an empty property value check that it serializes correctly"""
365
345
        s_v5 = breezy.bzr.xml5.serializer_v5
366
346
        rev = s_v5.read_revision_from_string(_revision_v5)
367
 
        props = {'empty': '', 'one': 'one'}
 
347
        outp = BytesIO()
 
348
        props = {'empty':'', 'one':'one'}
368
349
        rev.properties = props
369
 
        txt = b''.join(s_v5.write_revision_to_lines(rev))
 
350
        txt = s_v5.write_revision_to_string(rev)
370
351
        new_rev = s_v5.read_revision_from_string(txt)
371
352
        self.assertEqual(props, new_rev.properties)
372
353
 
379
360
        inv.get_entry(b'tree-root-321').revision = b'rev_outer'
380
361
        inv.get_entry(b'dir-id').revision = b'rev_outer'
381
362
        inv.get_entry(b'file-id').revision = b'rev_outer'
382
 
        inv.get_entry(b'file-id').text_sha1 = b'A'
 
363
        inv.get_entry(b'file-id').text_sha1 = 'A'
383
364
        inv.get_entry(b'file-id').text_size = 1
384
365
        inv.get_entry(b'link-id').revision = b'rev_outer'
385
366
        inv.get_entry(b'link-id').symlink_target = 'a'
389
370
        inv = self.get_sample_inventory()
390
371
        inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
391
372
                                        b'rev_outer', b'rev_inner'))
 
373
        txt = xml7.serializer_v7.write_inventory_to_string(inv)
392
374
        lines = xml7.serializer_v7.write_inventory_to_lines(inv)
393
 
        self.assertEqualDiff(_expected_inv_v7, b''.join(lines))
394
 
        inv2 = xml7.serializer_v7.read_inventory_from_lines(lines)
 
375
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
 
376
        self.assertEqualDiff(_expected_inv_v7, txt)
 
377
        inv2 = xml7.serializer_v7.read_inventory_from_string(txt)
395
378
        self.assertEqual(5, len(inv2))
396
379
        for path, ie in inv.iter_entries():
397
380
            self.assertEqual(ie, inv2.get_entry(ie.file_id))
398
381
 
399
382
    def test_roundtrip_inventory_v6(self):
400
383
        inv = self.get_sample_inventory()
 
384
        txt = xml6.serializer_v6.write_inventory_to_string(inv)
401
385
        lines = xml6.serializer_v6.write_inventory_to_lines(inv)
402
 
        self.assertEqualDiff(_expected_inv_v6, b''.join(lines))
403
 
        inv2 = xml6.serializer_v6.read_inventory_from_lines(lines)
 
386
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
 
387
        self.assertEqualDiff(_expected_inv_v6, txt)
 
388
        inv2 = xml6.serializer_v6.read_inventory_from_string(txt)
404
389
        self.assertEqual(4, len(inv2))
405
390
        for path, ie in inv.iter_entries():
406
391
            self.assertEqual(ie, inv2.get_entry(ie.file_id))
410
395
        s_v6 = breezy.bzr.xml6.serializer_v6
411
396
        s_v7 = xml7.serializer_v7
412
397
        self.assertRaises(errors.UnexpectedInventoryFormat,
413
 
                          s_v7.read_inventory_from_lines,
414
 
                          breezy.osutils.split_lines(_expected_inv_v5))
 
398
                          s_v7.read_inventory_from_string, _expected_inv_v5)
415
399
        self.assertRaises(errors.UnexpectedInventoryFormat,
416
 
                          s_v6.read_inventory_from_lines,
417
 
                          breezy.osutils.split_lines(_expected_inv_v7))
 
400
                          s_v6.read_inventory_from_string, _expected_inv_v7)
418
401
 
419
402
    def test_tree_reference(self):
420
403
        s_v5 = breezy.bzr.xml5.serializer_v5
425
408
        inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
426
409
                                        b'rev-outer', b'rev-inner'))
427
410
        self.assertRaises(errors.UnsupportedInventoryKind,
428
 
                          s_v5.write_inventory_to_lines, inv)
 
411
                          s_v5.write_inventory_to_string, inv)
429
412
        self.assertRaises(errors.UnsupportedInventoryKind,
430
 
                          s_v6.write_inventory_to_lines, inv)
431
 
        lines = s_v7.write_inventory_to_chunks(inv)
432
 
        inv2 = s_v7.read_inventory_from_lines(lines)
433
 
        self.assertEqual(b'tree-root-321',
434
 
                         inv2.get_entry(b'nested-id').parent_id)
 
413
                          s_v6.write_inventory_to_string, inv)
 
414
        txt = s_v7.write_inventory_to_string(inv)
 
415
        lines = s_v7.write_inventory_to_lines(inv)
 
416
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
 
417
        inv2 = s_v7.read_inventory_from_string(txt)
 
418
        self.assertEqual(b'tree-root-321', inv2.get_entry(b'nested-id').parent_id)
435
419
        self.assertEqual(b'rev-outer', inv2.get_entry(b'nested-id').revision)
436
 
        self.assertEqual(
437
 
            b'rev-inner', inv2.get_entry(b'nested-id').reference_revision)
 
420
        self.assertEqual(b'rev-inner', inv2.get_entry(b'nested-id').reference_revision)
438
421
 
439
422
    def test_roundtrip_inventory_v8(self):
440
423
        inv = self.get_sample_inventory()
441
 
        lines = xml8.serializer_v8.write_inventory_to_lines(inv)
442
 
        inv2 = xml8.serializer_v8.read_inventory_from_lines(lines)
 
424
        txt = xml8.serializer_v8.write_inventory_to_string(inv)
 
425
        inv2 = xml8.serializer_v8.read_inventory_from_string(txt)
443
426
        self.assertEqual(4, len(inv2))
444
427
        for path, ie in inv.iter_entries():
445
428
            self.assertEqual(ie, inv2.get_entry(ie.file_id))
446
429
 
447
430
    def test_inventory_text_v8(self):
448
431
        inv = self.get_sample_inventory()
 
432
        txt = xml8.serializer_v8.write_inventory_to_string(inv)
449
433
        lines = xml8.serializer_v8.write_inventory_to_lines(inv)
450
 
        self.assertEqualDiff(_expected_inv_v8, b''.join(lines))
 
434
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
 
435
        self.assertEqualDiff(_expected_inv_v8, txt)
451
436
 
452
437
    def test_revision_text_v6(self):
453
438
        """Pack revision to XML v6"""
454
439
        rev = breezy.bzr.xml6.serializer_v6.read_revision_from_string(
455
440
            _expected_rev_v5)
456
 
        serialized = breezy.bzr.xml6.serializer_v6.write_revision_to_lines(
457
 
            rev)
458
 
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v5)
 
441
        serialized = breezy.bzr.xml6.serializer_v6.write_revision_to_string(rev)
 
442
        self.assertEqualDiff(serialized, _expected_rev_v5)
459
443
 
460
444
    def test_revision_text_v7(self):
461
445
        """Pack revision to XML v7"""
462
446
        rev = breezy.bzr.xml7.serializer_v7.read_revision_from_string(
463
447
            _expected_rev_v5)
464
 
        serialized = breezy.bzr.xml7.serializer_v7.write_revision_to_lines(
465
 
            rev)
466
 
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v5)
 
448
        serialized = breezy.bzr.xml7.serializer_v7.write_revision_to_string(rev)
 
449
        self.assertEqualDiff(serialized, _expected_rev_v5)
467
450
 
468
451
    def test_revision_text_v8(self):
469
452
        """Pack revision to XML v8"""
470
453
        rev = breezy.bzr.xml8.serializer_v8.read_revision_from_string(
471
454
            _expected_rev_v8)
472
 
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_lines(
473
 
            rev)
474
 
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v8)
475
 
 
476
 
    def test_revision_text_v8_complex(self):
477
 
        """Pack revision to XML v8"""
478
 
        rev = breezy.bzr.xml8.serializer_v8.read_revision_from_string(
479
 
            _expected_rev_v8_complex)
480
 
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_lines(
481
 
            rev)
482
 
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v8_complex)
 
455
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_string(rev)
 
456
        self.assertEqualDiff(serialized, _expected_rev_v8)
483
457
 
484
458
    def test_revision_ids_are_utf8(self):
485
459
        """Parsed revision_ids should all be utf-8 strings, not unicode."""
486
460
        s_v5 = breezy.bzr.xml5.serializer_v5
487
461
        rev = s_v5.read_revision_from_string(_revision_utf8_v5)
488
 
        self.assertEqual(b'erik@b\xc3\xa5gfors-02', rev.revision_id)
489
 
        self.assertIsInstance(rev.revision_id, bytes)
490
 
        self.assertEqual([b'erik@b\xc3\xa5gfors-01'], rev.parent_ids)
 
462
        self.assertEqual('erik@b\xc3\xa5gfors-02', rev.revision_id)
 
463
        self.assertIsInstance(rev.revision_id, str)
 
464
        self.assertEqual(['erik@b\xc3\xa5gfors-01'], rev.parent_ids)
491
465
        for parent_id in rev.parent_ids:
492
 
            self.assertIsInstance(parent_id, bytes)
 
466
            self.assertIsInstance(parent_id, str)
493
467
        self.assertEqual(u'Include \xb5nicode characters\n', rev.message)
494
 
        self.assertIsInstance(rev.message, text_type)
 
468
        self.assertIsInstance(rev.message, unicode)
495
469
 
496
470
        # ie.revision should either be None or a utf-8 revision id
497
 
        inv = s_v5.read_inventory_from_lines(breezy.osutils.split_lines(_inventory_utf8_v5))
 
471
        inv = s_v5.read_inventory_from_string(_inventory_utf8_v5)
498
472
        rev_id_1 = u'erik@b\xe5gfors-01'.encode('utf8')
499
473
        rev_id_2 = u'erik@b\xe5gfors-02'.encode('utf8')
500
474
        fid_root = u'TRE\xe9_ROOT'.encode('utf8')
505
479
                    (u'b\xe5r', fid_bar1, fid_root, rev_id_1),
506
480
                    (u's\xb5bdir', fid_sub, fid_root, rev_id_1),
507
481
                    (u's\xb5bdir/b\xe5r', fid_bar2, fid_sub, rev_id_2),
508
 
                    ]
 
482
                   ]
509
483
        self.assertEqual(rev_id_2, inv.revision_id)
510
 
        self.assertIsInstance(inv.revision_id, bytes)
 
484
        self.assertIsInstance(inv.revision_id, str)
511
485
 
512
486
        actual = list(inv.iter_entries_by_dir())
513
487
        for ((exp_path, exp_file_id, exp_parent_id, exp_rev_id),
514
488
             (act_path, act_ie)) in zip(expected, actual):
515
489
            self.assertEqual(exp_path, act_path)
516
 
            self.assertIsInstance(act_path, text_type)
 
490
            self.assertIsInstance(act_path, unicode)
517
491
            self.assertEqual(exp_file_id, act_ie.file_id)
518
 
            self.assertIsInstance(act_ie.file_id, bytes)
 
492
            self.assertIsInstance(act_ie.file_id, str)
519
493
            self.assertEqual(exp_parent_id, act_ie.parent_id)
520
494
            if exp_parent_id is not None:
521
 
                self.assertIsInstance(act_ie.parent_id, bytes)
 
495
                self.assertIsInstance(act_ie.parent_id, str)
522
496
            self.assertEqual(exp_rev_id, act_ie.revision)
523
497
            if exp_rev_id is not None:
524
 
                self.assertIsInstance(act_ie.revision, bytes)
 
498
                self.assertIsInstance(act_ie.revision, str)
525
499
 
526
500
        self.assertEqual(len(expected), len(actual))
527
501
 
528
 
    def test_serialization_error(self):
529
 
        s_v5 = breezy.bzr.xml5.serializer_v5
530
 
        e = self.assertRaises(
531
 
            errors.UnexpectedInventoryFormat,
532
 
            s_v5.read_inventory_from_lines, [b"<Notquitexml"])
533
 
        self.assertEqual(str(e), "unclosed token: line 1, column 0")
534
 
 
535
502
 
536
503
class TestEncodeAndEscape(TestCase):
537
504
    """Whitebox testing of the _encode_and_escape function."""
547
514
        # are being used in xml attributes, and by returning it now, we have to
548
515
        # do fewer string operations later.
549
516
        val = breezy.bzr.xml_serializer.encode_and_escape('foo bar')
550
 
        self.assertEqual(b'foo bar', val)
 
517
        self.assertEqual('foo bar"', val)
551
518
        # The second time should be cached
552
519
        val2 = breezy.bzr.xml_serializer.encode_and_escape('foo bar')
553
520
        self.assertIs(val2, val)
554
521
 
555
522
    def test_ascii_with_xml(self):
556
 
        self.assertEqual(b'&amp;&apos;&quot;&lt;&gt;',
 
523
        self.assertEqual('&amp;&apos;&quot;&lt;&gt;"',
557
524
                         breezy.bzr.xml_serializer.encode_and_escape('&\'"<>'))
558
525
 
559
526
    def test_utf8_with_xml(self):
560
527
        # u'\xb5\xe5&\u062c'
561
 
        utf8_str = b'\xc2\xb5\xc3\xa5&\xd8\xac'
562
 
        self.assertEqual(b'&#181;&#229;&amp;&#1580;',
 
528
        utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
 
529
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
563
530
                         breezy.bzr.xml_serializer.encode_and_escape(utf8_str))
564
531
 
565
532
    def test_unicode(self):
566
533
        uni_str = u'\xb5\xe5&\u062c'
567
 
        self.assertEqual(b'&#181;&#229;&amp;&#1580;',
 
534
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
568
535
                         breezy.bzr.xml_serializer.encode_and_escape(uni_str))
569
536
 
570
537
 
572
539
 
573
540
    def test_unescape_xml(self):
574
541
        """We get some kind of error when malformed entities are passed"""
575
 
        self.assertRaises(KeyError, breezy.bzr.xml8._unescape_xml, b'foo&bar;')
 
542
        self.assertRaises(KeyError, breezy.bzr.xml8._unescape_xml, 'foo&bar;')