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

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

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