← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-29 22:03:03 UTC
  • mfrom: (5416.2.6 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100929220303-cr95h8iwtggco721
(mbp) Add 'break-lock --force'

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