/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 bzrlib/tests/per_workingtree/test_parents.py

  • Committer: Martin
  • Date: 2017-05-21 18:16:32 UTC
  • mto: (6621.2.22 py3)
  • mto: This revision was merged to the branch mainline in revision 6624.
  • Revision ID: gzlist@googlemail.com-20170521181632-kll0wqnsq8pipfpj
Use BytesIO or StringIO from bzrlib.sixish

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_parents.py
16
16
 
17
17
"""Tests of the parent related functions of WorkingTrees."""
18
18
 
19
 
from cStringIO import StringIO
20
19
import os
21
20
 
22
21
from bzrlib import (
30
29
    InventoryLink,
31
30
    )
32
31
from bzrlib.revisiontree import InventoryRevisionTree
 
32
from bzrlib.sixish import (
 
33
    BytesIO,
 
34
    )
33
35
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
34
36
from bzrlib.tests import (
35
37
    features,
400
402
                return 'a' * ie.text_size
401
403
 
402
404
            def get_file(self, file_id, path=None):
403
 
                return StringIO(self.get_file_text(file_id))
 
405
                return BytesIO(self.get_file_text(file_id))
404
406
 
405
407
        tree.lock_write()
406
408
        try: