From dc42448422f10b06b7d026afffebb2d33dbd5bc3 Mon Sep 17 00:00:00 2001 From: Eclips4 Date: Mon, 19 Jun 2023 22:59:01 +0300 Subject: [PATCH 1/2] Add is_cli param --- stdlib/pydoc.pyi | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/stdlib/pydoc.pyi b/stdlib/pydoc.pyi index ed97f1918e01..e320453cd4be 100644 --- a/stdlib/pydoc.pyi +++ b/stdlib/pydoc.pyi @@ -195,12 +195,24 @@ def resolve(thing: str | object, forceload: bool = ...) -> tuple[object, str] | def render_doc( thing: str | object, title: str = "Python Library Documentation: %s", forceload: bool = ..., renderer: Doc | None = None ) -> str: ... -def doc( - thing: str | object, - title: str = "Python Library Documentation: %s", - forceload: bool = ..., - output: SupportsWrite[str] | None = None, -) -> None: ... + +if sys.version_info >= (3, 11): + def doc( + thing: str | object, + title: str = "Python Library Documentation: %s", + forceload: bool = ..., + output: SupportsWrite[str] | None = None, + is_cli: bool = False, + ) -> None: ... + +else: + def doc( + thing: str | object, + title: str = "Python Library Documentation: %s", + forceload: bool = ..., + output: SupportsWrite[str] | None = None, + ) -> None: ... + def writedoc(thing: str | object, forceload: bool = ...) -> None: ... def writedocs(dir: str, pkgpath: str = "", done: Any | None = None) -> None: ... @@ -216,7 +228,11 @@ class Helper: def __call__(self, request: str | Helper | object = ...) -> None: ... def interact(self) -> None: ... def getline(self, prompt: str) -> str: ... - def help(self, request: Any) -> None: ... + if sys.version_info >= (3, 11): + def help(self, request: Any, is_cli: bool = False) -> None: ... + else: + def help(self, request: Any) -> None: ... + def intro(self) -> None: ... def list(self, items: _list[str], columns: int = 4, width: int = 80) -> None: ... def listkeywords(self) -> None: ... From 914b6b3fb86cec61e46d8f1cfd72f28f12016142 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Wed, 21 Jun 2023 14:43:46 +0100 Subject: [PATCH 2/2] Just 3.12+ for now --- stdlib/pydoc.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/pydoc.pyi b/stdlib/pydoc.pyi index e320453cd4be..c993af390bbb 100644 --- a/stdlib/pydoc.pyi +++ b/stdlib/pydoc.pyi @@ -196,7 +196,7 @@ def render_doc( thing: str | object, title: str = "Python Library Documentation: %s", forceload: bool = ..., renderer: Doc | None = None ) -> str: ... -if sys.version_info >= (3, 11): +if sys.version_info >= (3, 12): def doc( thing: str | object, title: str = "Python Library Documentation: %s", @@ -228,7 +228,7 @@ class Helper: def __call__(self, request: str | Helper | object = ...) -> None: ... def interact(self) -> None: ... def getline(self, prompt: str) -> str: ... - if sys.version_info >= (3, 11): + if sys.version_info >= (3, 12): def help(self, request: Any, is_cli: bool = False) -> None: ... else: def help(self, request: Any) -> None: ...