Skip to content

Commit a1ee29d

Browse files
committed
Bump types-docutils
1 parent a1b9444 commit a1ee29d

File tree

6 files changed

+88
-59
lines changed

6 files changed

+88
-59
lines changed

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ lint = [
9797
"sphinx-lint>=0.9",
9898
"types-colorama==0.4.15.20240311",
9999
"types-defusedxml==0.7.0.20250516",
100-
"types-docutils==0.21.0.20250514",
100+
"types-docutils==0.21.0.20250525",
101101
"types-Pillow==10.2.0.20240822",
102102
"types-Pygments==2.19.0.20250516",
103103
"types-requests==2.32.0.20250515", # align with requests
@@ -166,7 +166,7 @@ type-stubs = [
166166
# align with versions used elsewhere
167167
"types-colorama==0.4.15.20240311",
168168
"types-defusedxml==0.7.0.20250516",
169-
"types-docutils==0.21.0.20250514",
169+
"types-docutils==0.21.0.20250525",
170170
"types-Pillow==10.2.0.20240822",
171171
"types-Pygments==2.19.0.20250516",
172172
"types-requests==2.32.0.20250515",

sphinx/builders/_epub_base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ class NavPoint(NamedTuple):
114114

115115
def sphinx_smarty_pants(t: str, language: str = 'en') -> str:
116116
t = t.replace('"', '"')
117-
t = smartquotes.educateDashesOldSchool(t) # type: ignore[no-untyped-call]
118-
t = smartquotes.educateQuotes(t, language) # type: ignore[no-untyped-call]
117+
t = smartquotes.educateDashesOldSchool(t)
118+
t = smartquotes.educateQuotes(t, language)
119119
t = t.replace('"', '"')
120120
return t
121121

sphinx/util/rst.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from unicodedata import east_asian_width
1010

1111
from docutils.parsers.rst import roles
12-
from docutils.parsers.rst.languages import en as english # type: ignore[attr-defined]
12+
from docutils.parsers.rst.languages import en as english
1313
from docutils.parsers.rst.states import Body
1414
from docutils.utils import Reporter
1515
from jinja2 import pass_environment
@@ -66,7 +66,7 @@ def heading(env: Environment, text: str, level: int = 1) -> str:
6666
def default_role(docname: str, name: str) -> Iterator[None]:
6767
if name:
6868
dummy_reporter = Reporter('', 4, 4)
69-
role_fn, _ = roles.role(name, english, 0, dummy_reporter)
69+
role_fn, _ = roles.role(name, english, 0, dummy_reporter) # type: ignore[arg-type]
7070
if role_fn:
7171
docutils.register_role('', role_fn) # type: ignore[arg-type]
7272
else:

sphinx/writers/html5.py

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,22 @@
1717
from sphinx.util.images import get_image_size
1818

1919
if TYPE_CHECKING:
20-
from docutils.nodes import Element, Node, Text
20+
from docutils.nodes import (
21+
Element,
22+
Node,
23+
Text,
24+
bullet_list,
25+
caption,
26+
emphasis,
27+
field_list,
28+
figure,
29+
image,
30+
literal_block,
31+
reference,
32+
strong,
33+
table,
34+
title,
35+
)
2136

2237
from sphinx.builders import Builder
2338
from sphinx.builders.html import StandaloneHTMLBuilder
@@ -357,7 +372,7 @@ def visit_reference(self, node: Element) -> None:
357372
def visit_number_reference(self, node: Element) -> None:
358373
self.visit_reference(node)
359374

360-
def depart_number_reference(self, node: Element) -> None:
375+
def depart_number_reference(self, node: reference) -> None:
361376
self.depart_reference(node)
362377

363378
# overwritten -- we don't want source comments to show up in the HTML
@@ -451,7 +466,7 @@ def add_permalink_ref(self, node: Element, title: str) -> None:
451466
)
452467

453468
# overwritten
454-
def visit_bullet_list(self, node: Element) -> None:
469+
def visit_bullet_list(self, node: bullet_list) -> None:
455470
if len(node) == 1 and isinstance(node[0], addnodes.toctree):
456471
# avoid emitting empty <ul></ul>
457472
raise nodes.SkipNode
@@ -498,7 +513,7 @@ def depart_term(self, node: Element) -> None:
498513
self.body.append('</dt>')
499514

500515
# overwritten
501-
def visit_title(self, node: Element) -> None:
516+
def visit_title(self, node: title) -> None:
502517
if (
503518
isinstance(node.parent, addnodes.compact_paragraph)
504519
and node.parent.get('toctree')
@@ -535,7 +550,7 @@ def visit_title(self, node: Element) -> None:
535550
self.body.pop()
536551
self.context[-1] = '</p>\n'
537552

538-
def depart_title(self, node: Element) -> None:
553+
def depart_title(self, node: title) -> None:
539554
close_tag = self.context[-1]
540555
if (
541556
self.config.html_permalinks
@@ -586,7 +601,7 @@ def depart_rubric(self, node: nodes.rubric) -> None:
586601
super().depart_rubric(node)
587602

588603
# overwritten
589-
def visit_literal_block(self, node: Element) -> None:
604+
def visit_literal_block(self, node: literal_block) -> None:
590605
if node.rawsource != node.astext():
591606
# most probably a parsed-literal block -- don't highlight
592607
return super().visit_literal_block(node)
@@ -614,7 +629,7 @@ def visit_literal_block(self, node: Element) -> None:
614629
self.body.append(starttag + highlighted + '</div>\n')
615630
raise nodes.SkipNode
616631

617-
def visit_caption(self, node: Element) -> None:
632+
def visit_caption(self, node: caption) -> None:
618633
if (
619634
isinstance(node.parent, nodes.container)
620635
and node.parent.get('literal_block')
@@ -625,7 +640,7 @@ def visit_caption(self, node: Element) -> None:
625640
self.add_fignumber(node.parent)
626641
self.body.append(self.starttag(node, 'span', '', CLASS='caption-text'))
627642

628-
def depart_caption(self, node: Element) -> None:
643+
def depart_caption(self, node: caption) -> None:
629644
self.body.append('</span>')
630645

631646
# append permalink if available
@@ -648,7 +663,7 @@ def depart_caption(self, node: Element) -> None:
648663
super().depart_caption(node)
649664

650665
def visit_doctest_block(self, node: Element) -> None:
651-
self.visit_literal_block(node)
666+
self.visit_literal_block(node) # type: ignore[arg-type]
652667

653668
# overwritten to add the <div> (for XHTML compliance)
654669
def visit_block_quote(self, node: Element) -> None:
@@ -740,14 +755,14 @@ def depart_download_reference(self, node: Element) -> None:
740755
self.body.append(self.context.pop())
741756

742757
# overwritten
743-
def visit_figure(self, node: Element) -> None:
758+
def visit_figure(self, node: figure) -> None:
744759
# set align=default if align not specified to give a default style
745760
node.setdefault('align', 'default')
746761

747762
return super().visit_figure(node)
748763

749764
# overwritten
750-
def visit_image(self, node: Element) -> None:
765+
def visit_image(self, node: image) -> None:
751766
olduri = node['uri']
752767
# rewrite the URI if the environment knows about it
753768
if olduri in self.builder.images:
@@ -775,7 +790,7 @@ def visit_image(self, node: Element) -> None:
775790
super().visit_image(node)
776791

777792
# overwritten
778-
def depart_image(self, node: Element) -> None:
793+
def depart_image(self, node: image) -> None:
779794
if node['uri'].lower().endswith(('svg', 'svgz')):
780795
pass
781796
else:
@@ -892,16 +907,16 @@ def visit_tip(self, node: Element) -> None:
892907
def depart_tip(self, node: Element) -> None:
893908
self.depart_admonition(node)
894909

895-
def visit_literal_emphasis(self, node: Element) -> None:
910+
def visit_literal_emphasis(self, node: emphasis) -> None:
896911
return self.visit_emphasis(node)
897912

898-
def depart_literal_emphasis(self, node: Element) -> None:
913+
def depart_literal_emphasis(self, node: emphasis) -> None:
899914
return self.depart_emphasis(node)
900915

901-
def visit_literal_strong(self, node: Element) -> None:
916+
def visit_literal_strong(self, node: strong) -> None:
902917
return self.visit_strong(node)
903918

904-
def depart_literal_strong(self, node: Element) -> None:
919+
def depart_literal_strong(self, node: strong) -> None:
905920
return self.depart_strong(node)
906921

907922
def visit_abbreviation(self, node: Element) -> None:
@@ -913,15 +928,15 @@ def visit_abbreviation(self, node: Element) -> None:
913928
def depart_abbreviation(self, node: Element) -> None:
914929
self.body.append('</abbr>')
915930

916-
def visit_manpage(self, node: Element) -> None:
931+
def visit_manpage(self, node: emphasis) -> None:
917932
self.visit_literal_emphasis(node)
918933

919-
def depart_manpage(self, node: Element) -> None:
934+
def depart_manpage(self, node: emphasis) -> None:
920935
self.depart_literal_emphasis(node)
921936

922937
# overwritten to add even/odd classes
923938

924-
def visit_table(self, node: Element) -> None:
939+
def visit_table(self, node: table) -> None:
925940
self._table_row_indices.append(0)
926941

927942
atts = {}
@@ -936,7 +951,7 @@ def visit_table(self, node: Element) -> None:
936951
tag = self.starttag(node, 'table', CLASS=' '.join(classes), **atts)
937952
self.body.append(tag)
938953

939-
def depart_table(self, node: Element) -> None:
954+
def depart_table(self, node: table) -> None:
940955
self._table_row_indices.pop()
941956
super().depart_table(node)
942957

@@ -949,11 +964,11 @@ def visit_row(self, node: Element) -> None:
949964
self.body.append(self.starttag(node, 'tr', ''))
950965
node.column = 0 # type: ignore[attr-defined]
951966

952-
def visit_field_list(self, node: Element) -> None:
967+
def visit_field_list(self, node: field_list) -> None:
953968
self._fieldlist_row_indices.append(0)
954969
return super().visit_field_list(node)
955970

956-
def depart_field_list(self, node: Element) -> None:
971+
def depart_field_list(self, node: field_list) -> None:
957972
self._fieldlist_row_indices.pop()
958973
return super().depart_field_list(node)
959974

0 commit comments

Comments
 (0)