/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/help.py

  • Committer: Robert Collins
  • Date: 2010-07-04 06:22:11 UTC
  • mto: This revision was merged to the branch mainline in revision 5332.
  • Revision ID: robertc@robertcollins.net-20100704062211-tk9hw6bnsn5x47fm
``bzrlib.lsprof.profile`` will no longer silently generate bad threaded
profiles when concurrent profile requests are made. Instead the profile
requests will be serialised. Reentrant requests will now deadlock.
(Robert Collins)

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: