floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doctest: remove unnecessary Optionals

This commit is contained in:
Ran Benita 2023-09-08 11:00:09 +03:00
parent ab63ebb3dc
commit 2ed2e9208d
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/_pytest/doctest.py
View File

@ -255,8 +255,8 @@ class DoctestItem(Item):
self, self,
name: str, name: str,
parent: "Union[DoctestTextfile, DoctestModule]", parent: "Union[DoctestTextfile, DoctestModule]",
runner: Optional["doctest.DocTestRunner"] = None, runner: "doctest.DocTestRunner",
dtest: Optional["doctest.DocTest"] = None, dtest: "doctest.DocTest",
) -> None: ) -> None:
super().__init__(name, parent) super().__init__(name, parent)
self.runner = runner self.runner = runner
@ -288,19 +288,13 @@ class DoctestItem(Item):
self._request = TopRequest(self, _ispytest=True) # type: ignore[arg-type] self._request = TopRequest(self, _ispytest=True) # type: ignore[arg-type]
def setup(self) -> None: def setup(self) -> None:
if self.dtest is not None: self._request._fillfixtures()
self._request._fillfixtures() globs = dict(getfixture=self._request.getfixturevalue)
for name, value in self._request.getfixturevalue("doctest_namespace").items():
globs = dict(getfixture=self._request.getfixturevalue) globs[name] = value
for name, value in self._request.getfixturevalue( self.dtest.globs.update(globs)
"doctest_namespace"
).items():
globs[name] = value
self.dtest.globs.update(globs)
def runtest(self) -> None: def runtest(self) -> None:
assert self.dtest is not None
assert self.runner is not None
_check_all_skipped(self.dtest) _check_all_skipped(self.dtest)
self._disable_output_capturing_for_darwin() self._disable_output_capturing_for_darwin()
failures: List["doctest.DocTestFailure"] = [] failures: List["doctest.DocTestFailure"] = []
@ -387,7 +381,6 @@ class DoctestItem(Item):
return ReprFailDoctest(reprlocation_lines) return ReprFailDoctest(reprlocation_lines)
def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str]: def reportinfo(self) -> Tuple[Union["os.PathLike[str]", str], Optional[int], str]:
assert self.dtest is not None
return self.path, self.dtest.lineno, "[doctest] %s" % self.name return self.path, self.dtest.lineno, "[doctest] %s" % self.name