← 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: Patch Queue Manager
  • Date: 2015-09-30 16:43:21 UTC
  • mfrom: (6603.2.2 fix-keep-dirty)
  • Revision ID: pqm@pqm.ubuntu.com-20150930164321-ct2v2qnmvimqt8qf
(vila) Avoid associating dirty patch headers with the previous file in the
 patch. (Colin Watson)

Show diffs side-by-side

added added

removed removed

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