/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/plugins/news_merge/parser.py

  • Committer: Parth Malwankar
  • Date: 2010-03-11 06:24:00 UTC
  • mto: (5094.3.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5107.
  • Revision ID: parth.malwankar@gmail.com-20100311062400-17bx45mt09fuhkri
closed Martins review comments.
from https://code.edge.launchpad.net/~parthm/bzr/376388-dot-bazaar-ownership/+merge/19691

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
 
 
35
28
def simple_parse(content):
36
29
    """Returns blocks, where each block is a 2-tuple (kind, text).
37
30