summaryrefslogtreecommitdiff
path: root/django/contrib/admindocs
diff options
context:
space:
mode:
authorNatalia <124304+nessita@users.noreply.github.com>2025-08-01 09:48:51 -0300
committernessita <124304+nessita@users.noreply.github.com>2025-08-04 21:52:25 -0300
commit9cec8d9f55d90fbc162fde23d6ea7a34e322fcae (patch)
treeb2d1696b4e14194d8fde0b10d3186671873f70c8 /django/contrib/admindocs
parentdca8284a376128c64bd0e0792ad12391ae3e7202 (diff)
Fixed #36535 -- Ensured compatibility with docutils 0.19 through 0.22.
Regression in 65ab92f6a83644bbb555d0eff3a02d8d9301aba4.
Diffstat (limited to 'django/contrib/admindocs')
-rw-r--r--django/contrib/admindocs/utils.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/django/contrib/admindocs/utils.py b/django/contrib/admindocs/utils.py
index 334d9907ea..4d9403a6f7 100644
--- a/django/contrib/admindocs/utils.py
+++ b/django/contrib/admindocs/utils.py
@@ -13,6 +13,7 @@ try:
import docutils.core
import docutils.nodes
import docutils.parsers.rst.roles
+ import docutils.writers
except ImportError:
docutils_is_available = False
else:
@@ -78,11 +79,14 @@ def parse_rst(text, default_reference_context, thing_being_parsed=None):
.. default-role::
"""
+ # In docutils < 0.22, the `writer` param must be an instance. Passing a
+ # string writer name like "html" is only supported in 0.22+.
+ writer_instance = docutils.writers.get_writer_class("html")()
parts = docutils.core.publish_parts(
source % text,
source_path=thing_being_parsed,
destination_path=None,
- writer="html",
+ writer=writer_instance,
settings_overrides=overrides,
)
return mark_safe(parts["fragment"])