/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_merge3.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/test_merge3.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from breezy import (
 
18
from .. import (
19
19
    merge3,
20
20
    tests,
21
21
    )
22
 
from breezy.errors import CantReprocessAndShowBase, BinaryFile
 
22
from ..errors import CantReprocessAndShowBase, BinaryFile
 
23
from ..sixish import (
 
24
    BytesIO,
 
25
    )
23
26
 
24
27
def split_lines(t):
25
 
    from cStringIO import StringIO
26
 
    return StringIO(t).readlines()
 
28
    return BytesIO(t).readlines()
27
29
 
28
30
############################################################
29
31
# test case data from the gnu diffutils manual