/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/serializer/__init__.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 10:19:02 UTC
  • mfrom: (6973.7.13 python3-g-real)
  • Revision ID: breezy.the.bot@gmail.com-20180630101902-thpqkbi44kqom06g
Fix more tests.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bundle/serializer/__init__.py
47
47
 
48
48
 
49
49
def _get_bundle_header(version):
50
 
    return b''.join([BUNDLE_HEADER, version, b'\n'])
 
50
    return b''.join([BUNDLE_HEADER, version.encode('ascii'), b'\n'])
51
51
 
52
52
def _get_filename(f):
53
53
    return getattr(f, 'name', '<unknown>')
63
63
    for line in f:
64
64
        m = BUNDLE_HEADER_RE.match(line)
65
65
        if m:
66
 
            if m.group('lineending') != '':
 
66
            if m.group('lineending') != b'':
67
67
                raise errors.UnsupportedEOLMarker()
68
68
            version = m.group('version')
69
69
            break
79
79
    if version is None:
80
80
        raise errors.NotABundle('Did not find an opening header')
81
81
 
82
 
    return get_serializer(version).read(f)
 
82
    return get_serializer(version.decode('ascii')).read(f)
83
83
 
84
84
 
85
85
def get_serializer(version):