/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/bundle/bundle_data.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-30 14:28:33 UTC
  • mfrom: (7005 work)
  • mto: This revision was merged to the branch mainline in revision 7008.
  • Revision ID: jelmer@jelmer.uk-20180630142833-eg208wfe8la76m0x
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/bundle_data.py
19
19
from __future__ import absolute_import
20
20
 
21
21
import base64
 
22
from io import BytesIO
22
23
import os
23
24
import pprint
24
25
 
41
42
from ..osutils import sha_string, pathjoin
42
43
from ..revision import Revision, NULL_REVISION
43
44
from ..sixish import (
44
 
    BytesIO,
45
45
    viewitems,
46
46
    )
47
47
from ..testament import StrictTestament
791
791
    """Produce a file-like object with the patched version of a text"""
792
792
    from breezy.patches import iter_patched
793
793
    from breezy.iterablefile import IterableFile
794
 
    if file_patch == "":
 
794
    if file_patch == b"":
795
795
        return IterableFile(())
796
796
    # string.splitlines(True) also splits on '\r', but the iter_patched code
797
797
    # only expects to iterate over '\n' style lines