Skip to content

Commit 2ed2e92

Browse files
committed
doctest: remove unnecessary Optionals
1 parent ab63ebb commit 2ed2e92

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

src/_pytest/doctest.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ def __init__(
255255
self,
256256
name: str,
257257
parent: "Union[DoctestTextfile, DoctestModule]",
258-
runner: Optional["doctest.DocTestRunner"] = None,
259-
dtest: Optional["doctest.DocTest"] = None,
258+
runner: "doctest.DocTestRunner",
259+
dtest: "doctest.DocTest",
260260
) -> None:
261261
super().__init__(name, parent)
262262
self.runner = runner
@@ -288,19 +288,13 @@ def _initrequest(self) -> None:
288288
self._request = TopRequest(self, _ispytest=True) # type: ignore[arg-type]
289289

290290
def setup(self) -> None:
291-
if self.dtest is not None:
292-
self._request._fillfixtures()
293-
294-
globs = dict(getfixture=self._request.getfixturevalue)
295-
for name, value in self._request.getfixturevalue(
296-
"doctest_namespace"
297-
).items():
298-
globs[name] = value
299-
self.dtest.globs.update(globs)
291+
self._request._fillfixtures()
292+
globs = dict(getfixture=self._request.getfixturevalue)
293+
for name, value in self._request.getfixturevalue("doctest_namespace").items():
294+
globs[name] = value
295+
self.dtest.globs.update(globs)
300296

301297
def runtest(self) -> None:
302-
assert self.dtest is not None
303-
assert self.runner is not None
304298
_check_all_skipped(self.dtest)
305299
self._disable_output_capturing_for_darwin()
306300
failures: List["doctest.DocTestFailure"] = []
@@ -387,7 +381,6 @@ def repr_failure( # type: ignore[override]
387381
return ReprFailDoctest(reprlocation_lines)
388382

389383
def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str]:
390-
assert self.dtest is not None
391384
return self.path, self.dtest.lineno, "[doctest] %s" % self.name
392385

393386

0 commit comments

Comments
 (0)