summaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/connection.rst2
-rwxr-xr-xdoc/src/tools/lib/dbapi_extension.py13
2 files changed, 7 insertions, 8 deletions
diff --git a/doc/src/connection.rst b/doc/src/connection.rst
index 436d83f..454f80d 100644
--- a/doc/src/connection.rst
+++ b/doc/src/connection.rst
@@ -551,7 +551,7 @@ The ``connection`` class
the session.
.. doctest::
- :options: NORMALIZE_WHITESPACE
+ :options: +NORMALIZE_WHITESPACE
>>> cur.execute("CREATE TABLE foo (id serial PRIMARY KEY);")
>>> pprint(conn.notices)
diff --git a/doc/src/tools/lib/dbapi_extension.py b/doc/src/tools/lib/dbapi_extension.py
index cb3fec4..7ab656f 100755
--- a/doc/src/tools/lib/dbapi_extension.py
+++ b/doc/src/tools/lib/dbapi_extension.py
@@ -12,7 +12,7 @@
from docutils import nodes
from sphinx.locale import _
-from sphinx.util.compat import Directive, make_admonition
+from docutils.parsers.rst import Directive
class extension_node(nodes.Admonition, nodes.Element): pass
@@ -29,12 +29,11 @@ class Extension(Directive):
option_spec = {}
def run(self):
- nodes = make_admonition(extension_node,
- self.name, [_('DB API extension')], self.options,
- self.content, self.lineno, self.content_offset,
- self.block_text, self.state, self.state_machine)
- nodes[0]['classes'].append('dbapi-extension')
- return nodes
+ node = extension_node('\n'.join(self.content))
+ node += nodes.title(_('DB API extension'), _('DB API extension'))
+ self.state.nested_parse(self.content, self.content_offset, node)
+ node['classes'].append('dbapi-extension')
+ return [node]
def visit_extension_node(self, node):