/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-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

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
27
 
30
28
def simple_parse_lines(lines):
31
29
    """Same as simple_parse, but takes an iterable of strs rather than a single
36
34
 
37
35
def simple_parse(content):
38
36
    """Returns blocks, where each block is a 2-tuple (kind, text).
39
 
 
 
37
    
40
38
    :kind: one of 'heading', 'release', 'section', 'empty' or 'text'.
41
39
    :text: a str, including newlines.
42
40
    """
68
66
    import sys
69
67
    content = open(sys.argv[1], 'rb').read()
70
68
    for result in simple_parse(content):
71
 
        print(result)
 
69
        print result