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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/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
 
from breezy import (
 
21
from ... import (
23
22
    errors,
24
23
    revision as _mod_revision,
25
24
    )
26
 
from breezy.inventory import (
 
25
from ...inventory import (
27
26
    Inventory,
28
27
    InventoryFile,
29
28
    InventoryDirectory,
30
29
    InventoryLink,
31
30
    )
32
 
from breezy.revisiontree import InventoryRevisionTree
33
 
from breezy.tests.per_workingtree import TestCaseWithWorkingTree
34
 
from breezy.tests import (
 
31
from ...revisiontree import InventoryRevisionTree
 
32
from ...sixish import (
 
33
    BytesIO,
 
34
    )
 
35
from ..per_workingtree import TestCaseWithWorkingTree
 
36
from .. import (
35
37
    features,
36
38
    )
37
 
from breezy.uncommit import uncommit
 
39
from ...uncommit import uncommit
38
40
 
39
41
 
40
42
class TestParents(TestCaseWithWorkingTree):
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: