/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: Robert Collins
  • Date: 2010-02-28 10:08:29 UTC
  • mto: This revision was merged to the branch mainline in revision 5062.
  • Revision ID: robertc@robertcollins.net-20100228100829-nroa3qp8zi8jwxke
* bzr now has a ``.testr.conf`` file in its source tree configured
  appropriately for running tests with Testrepository
  (``https://launchpad.net/testrepository``). (Robert Collins)

* Documentation about testing with ``subunit`` has been tweaked.
  (Robert Collins)

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