← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/news_merge/parser.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/parser.py
25
25
"""
26
26
 
27
27
 
 
28
def simple_parse_lines(lines):
 
29
    """Same as simple_parse, but takes an iterable of strs rather than a single
 
30
    str.
 
31
    """
 
32
    return simple_parse(''.join(lines))
 
33
 
 
34
 
28
35
def simple_parse(content):
29
36
    """Returns blocks, where each block is a 2-tuple (kind, text).
30
37