/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-25 00:54:22 UTC
  • mfrom: (7045.1.23 python3-p)
  • Revision ID: breezy.the.bot@gmail.com-20180725005422-a1rubn7zssfn2uvu
Fix some more tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-p/+merge/349784

Show diffs side-by-side

added added

removed removed

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