← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-docutils/quantal

« back to all changes in this revision

Viewing changes to docutils/parsers/rst/directives/admonitions.py

  • Committer: Bazaar Package Importer
  • Author(s): Jakub Wilk
  • Date: 2009-12-13 19:54:12 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20091213195412-9o7q348lfkucx01f
http://bugs.debian.org/560330
http://bugs.debian.org/560328
http://bugs.debian.org/560755
* Unconditionally recommend python-lxml, as it is used by
  /usr/bin/rst2odt_prepstyles (closes: #560330).
* Demote dependency on an ElementTree implementation to recommendation, as it
  is only used by /usr/bin/rst2odt; remove python-lxml from alternatives, as
  it is never used by the script (closes: #560328).
* Fix insecure use of temporary files in the Emacs major mode for
  reStructuredText (closes: #560755). Thanks to Kumar Appaiah for helping to
  deal with this bug.
* Register docutils documentation using doc-base.

Show diffs side-by-side

added added

removed removed

Lines of Context:
docutils/parsers/rst/directives/admonitions.py
1
 
# $Id: admonitions.py 4667 2006-07-12 21:40:56Z wiemann $
 
1
# $Id: admonitions.py 5618 2008-07-28 08:37:32Z strank $
2
2
# Author: David Goodger <goodger@python.org>
3
3
# Copyright: This module has been placed in the public domain.
4
4
 
35
35
                                                         self.lineno)
36
36
            admonition_node += nodes.title(title_text, '', *textnodes)
37
37
            admonition_node += messages
38
 
            if self.options.has_key('class'):
 
38
            if 'class' in self.options:
39
39
                classes = self.options['class']
40
40
            else:
41
41
                classes = ['admonition-' + nodes.make_id(title_text)]