/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 bzrlib/_btree_serializer_py.py

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_btree_serializer_py.py
19
19
 
20
20
from __future__ import absolute_import
21
21
 
22
 
from .. import static_tuple
23
 
 
24
 
 
25
 
def _parse_leaf_lines(data, key_length, ref_list_length):
26
 
    lines = data.split(b'\n')
 
22
from bzrlib import static_tuple
 
23
 
 
24
 
 
25
def _parse_leaf_lines(bytes, key_length, ref_list_length):
 
26
    lines = bytes.split('\n')
27
27
    nodes = []
28
28
    as_st = static_tuple.StaticTuple.from_sequence
29
29
    stuple = static_tuple.StaticTuple
30
30
    for line in lines[1:]:
31
 
        if line == b'':
 
31
        if line == '':
32
32
            return nodes
33
 
        elements = line.split(b'\0', key_length)
 
33
        elements = line.split('\0', key_length)
34
34
        # keys are tuples
35
35
        key = as_st(elements[:key_length]).intern()
36
36
        line = elements[-1]
37
 
        references, value = line.rsplit(b'\0', 1)
 
37
        references, value = line.rsplit('\0', 1)
38
38
        if ref_list_length:
39
39
            ref_lists = []
40
 
            for ref_string in references.split(b'\t'):
41
 
                ref_list = as_st([as_st(ref.split(b'\0')).intern()
42
 
                                  for ref in ref_string.split(b'\r') if ref])
 
40
            for ref_string in references.split('\t'):
 
41
                ref_list = as_st([as_st(ref.split('\0')).intern()
 
42
                                  for ref in ref_string.split('\r') if ref])
43
43
                ref_lists.append(ref_list)
44
44
            ref_lists = as_st(ref_lists)
45
45
            node_value = stuple(value, ref_lists)
63
63
        # TODO: Consider turning this back into the 'unoptimized' nested loop
64
64
        #       form. It is probably more obvious for most people, and this is
65
65
        #       just a reference implementation.
66
 
        flattened_references = [b'\r'.join([b'\x00'.join(reference)
67
 
                                            for reference in ref_list])
 
66
        flattened_references = ['\r'.join(['\x00'.join(reference)
 
67
                                           for reference in ref_list])
68
68
                                for ref_list in node[3]]
69
69
    else:
70
70
        flattened_references = []
71
 
    string_key = b'\x00'.join(node[1])
72
 
    line = (b"%s\x00%s\x00%s\n" % (string_key,
73
 
        b'\t'.join(flattened_references), node[2]))
 
71
    string_key = '\x00'.join(node[1])
 
72
    line = ("%s\x00%s\x00%s\n" % (string_key,
 
73
        '\t'.join(flattened_references), node[2]))
74
74
    return string_key, line