/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-07-11 21:06:20 UTC
  • mfrom: (7033 work)
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180711210620-pj0v9i3xe48qnsb2
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/bundle_data.py
351
351
            if encoding == 'base64':
352
352
                patch = base64.decodestring(''.join(lines))
353
353
            elif encoding is None:
354
 
                patch =  ''.join(lines)
 
354
                patch =  b''.join(lines)
355
355
            else:
356
356
                raise ValueError(encoding)
357
357
            bundle_tree.note_patch(path, patch)
642
642
                raise AssertionError("None: %s" % file_id)
643
643
            return patch_original
644
644
 
645
 
        if file_patch.startswith('\\'):
 
645
        if file_patch.startswith(b'\\'):
646
646
            raise ValueError(
647
647
                'Malformed patch for %s, %r' % (file_id, file_patch))
648
648
        return patched_file(file_patch, patch_original)