/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-08-21 19:28:52 UTC
  • mfrom: (7078 work)
  • mto: This revision was merged to the branch mainline in revision 7101.
  • Revision ID: jelmer@jelmer.uk-20180821192852-ipy6m8q95bbst223
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/bundle_data.py
350
350
 
351
351
        def do_patch(path, lines, encoding):
352
352
            if encoding == 'base64':
353
 
                patch = base64.decodestring(b''.join(lines))
 
353
                patch = base64.b64decode(b''.join(lines))
354
354
            elif encoding is None:
355
355
                patch =  b''.join(lines)
356
356
            else: