Skip to content

Commit b062fa9

Browse files
authored
Remove incorrect assertions (#14204)
1 parent 5c2ab21 commit b062fa9

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

CHANGES.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ Bugs fixed
2828
Patch by Adam Turner
2929
* #14089: autodoc: Fix default option parsing.
3030
Patch by Adam Turner
31+
* Remove incorrect static typing assertions.
32+
Patch by Adam Turner
3133

3234
Testing
3335
-------

sphinx/directives/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def run(self) -> list[Node]:
215215
# note_source uses 0-based line numbers.
216216
if line is not None:
217217
line -= 1
218-
self.state.document.note_source(source, line)
218+
self.state.document.note_source(source, line) # type: ignore[arg-type]
219219
node['domain'] = self.domain
220220
# 'desctype' is a backwards compatible attribute
221221
node['objtype'] = node['desctype'] = self.objtype

sphinx/ext/autodoc/directive.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def __init__(
7171
env: BuildEnvironment,
7272
reporter: Reporter | None,
7373
options: Options,
74-
lineno: int,
74+
lineno: int | None,
7575
state: Any,
7676
) -> None:
7777
self.env = env

sphinx/util/docutils.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -500,14 +500,12 @@ def config(self) -> Config:
500500
"""
501501
return self.env.config
502502

503-
def get_source_info(self) -> tuple[str, int]:
503+
def get_source_info(self) -> tuple[str | None, int | None]:
504504
"""Get source and line number.
505505
506506
.. versionadded:: 3.0
507507
"""
508508
source, line = self.state_machine.get_source_and_line(self.lineno)
509-
assert source is not None
510-
assert line is not None
511509
return source, line
512510

513511
def set_source_info(self, node: Node) -> None:
@@ -681,18 +679,20 @@ def config(self) -> Config:
681679
"""
682680
return self.env.config
683681

684-
def get_source_info(self, lineno: int | None = None) -> tuple[str, int]:
682+
def get_source_info(
683+
self, lineno: int | None = None
684+
) -> tuple[str | os.PathLike[str] | None, int | None]:
685685
# .. versionadded:: 3.0
686686
if lineno is None:
687687
lineno = self.lineno
688688
source, line = self.inliner.reporter.get_source_and_line(lineno)
689-
assert source is not None
690-
assert line is not None
691-
return str(source), line
689+
return source, line
692690

693691
def set_source_info(self, node: Node, lineno: int | None = None) -> None:
694692
# .. versionadded:: 2.0
695-
node.source, node.line = self.get_source_info(lineno)
693+
source, line = self.get_source_info(lineno)
694+
node.source = str(source) if source is not None else None
695+
node.line = line
696696

697697
def get_location(self) -> str:
698698
"""Get current location info for logging.

0 commit comments

Comments
 (0)