← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/help.py

  • Committer: Vincent Ladeuil
  • Date: 2010-08-28 15:34:24 UTC
  • mto: (5398.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5399.
  • Revision ID: v.ladeuil+lp@free.fr-20100828153424-yybmcql9o0t43m7a
https://launchpad.net/bugs/625686
Fix bug #625686 by removing the warning filter added by selftest.

* bzrlib/symbol_versioning.py:
(suppress_deprecation_warnings, activate_deprecation_warnings):
Always return a cleanup callable even if no filter is installed.

* bzrlib/versionedfile.py:
Drive-by cleanup, the module is not needed.

* bzrlib/builtins.py:
(cmd_selftest.run): Ensure we restore the right warning filters.

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: