← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help.py

Merge propagate-exceptions into sftp-leaks

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help.py
44
44
    try:
45
45
        topics = indices.search(topic)
46
46
        shadowed_terms = []
47
 
        for index, topic in topics[1:]:
 
47
        for index, topic_obj in topics[1:]:
48
48
            shadowed_terms.append('%s%s' % (index.prefix,
49
 
                topic.get_help_topic()))
 
49
                topic_obj.get_help_topic()))
50
50
        source = topics[0][1]
51
51
        outfile.write(source.get_help_text(shadowed_terms))
52
52
    except errors.NoHelpTopic: