remove python 3.8 compatibility cruft

Author: mhils

pdoc/__main__.py

@@ -7,7 +7,6 @@
 import sys
 import warnings
 
-from pdoc._compat import BooleanOptionalAction
 import pdoc.doc
 import pdoc.extract
 import pdoc.render
@@ -57,7 +56,7 @@
 )
 renderopts.add_argument(
     "--include-undocumented",
-    action=BooleanOptionalAction,
+    action=argparse.BooleanOptionalAction,
     default=True,
     help="Show classes/functions/variables that do not have a docstring.",
 )

pdoc/_compat.py

@@ -1,21 +1,6 @@
 # fmt: off
 import sys
 
-if sys.version_info >= (3, 9):
-    from functools import cache
-else:  # pragma: no cover
-    from functools import lru_cache
-
-    cache = lru_cache(maxsize=None)
-
-if sys.version_info >= (3, 9):
-    from ast import unparse as ast_unparse
-else:  # pragma: no cover
-    from astunparse import unparse as _unparse
-
-    def ast_unparse(t):  # type: ignore
-        return _unparse(t).strip("\t\n \"'")
-
 if sys.version_info >= (3, 12):
     from ast import TypeAlias as ast_TypeAlias
 else:  # pragma: no cover
@@ -34,33 +19,12 @@ class TypeAliasType:
     class TypeAlias:
         pass
 
-if sys.version_info >= (3, 9):
-    from types import GenericAlias
-else:  # pragma: no cover
-    from typing import _GenericAlias as GenericAlias
-
 if sys.version_info >= (3, 10):
     from types import UnionType  # type: ignore
 else:  # pragma: no cover
     class UnionType:
         pass
 
-if sys.version_info >= (3, 9):
-    removesuffix = str.removesuffix
-else:  # pragma: no cover
-    def removesuffix(x: str, suffix: str):
-        if x.endswith(suffix):
-            x = x[: -len(suffix)]
-        return x
-
-if sys.version_info >= (3, 9):
-    removeprefix = str.removeprefix
-else:  # pragma: no cover
-    def removeprefix(x: str, prefix: str):
-        if x.startswith(prefix):
-            x = x[len(prefix):]
-        return x
-
 
 if (3, 9) <= sys.version_info < (3, 9, 8) or (3, 10) <= sys.version_info < (3, 10, 1):  # pragma: no cover
     import inspect
@@ -76,53 +40,6 @@ def formatannotation(annotation) -> str:
 else:
     from inspect import formatannotation
 
-if sys.version_info >= (3, 9):
-    from argparse import BooleanOptionalAction
-else:  # pragma: no cover
-    # https://github.com/python/cpython/pull/27672
-    from argparse import Action
-
-    class BooleanOptionalAction(Action):  # pragma: no cover
-        def __init__(self,
-                     option_strings,
-                     dest,
-                     default=None,
-                     type=None,
-                     choices=None,
-                     required=False,
-                     help=None,
-                     metavar=None):
-
-            _option_strings = []
-            for option_string in option_strings:
-                _option_strings.append(option_string)
-
-                if option_string.startswith('--'):
-                    option_string = '--no-' + option_string[2:]
-                    _option_strings.append(option_string)
-
-            if help is not None and default is not None:
-                help += " (default: %(default)s)"
-
-            super().__init__(
-                option_strings=_option_strings,
-                dest=dest,
-                nargs=0,
-                default=default,
-                type=type,
-                choices=choices,
-                required=required,
-                help=help,
-                metavar=metavar)
-
-        def __call__(self, parser, namespace, values, option_string=None):
-            if option_string in self.option_strings:
-                setattr(namespace, self.dest, not option_string.startswith('--no-'))
-
-        def format_usage(self):
-            return ' | '.join(self.option_strings)
-
-
 if sys.version_info >= (3, 10):
     from typing import is_typeddict
 else:  # pragma: no cover
@@ -134,15 +51,10 @@ def is_typeddict(tp):
 
 
 __all__ = [
-    "cache",
-    "ast_unparse",
     "ast_TypeAlias",
     "TypeAliasType",
     "TypeAlias",
-    "GenericAlias",
     "UnionType",
-    "removesuffix",
     "formatannotation",
-    "BooleanOptionalAction",
     "is_typeddict",
 ]

pdoc/doc.py

@@ -23,6 +23,7 @@
 from collections.abc import Callable
 import dataclasses
 import enum
+from functools import cache
 from functools import cached_property
 from functools import singledispatchmethod
 from functools import wraps
@@ -48,7 +49,6 @@
 from pdoc import extract
 from pdoc._compat import TypeAlias
 from pdoc._compat import TypeAliasType
-from pdoc._compat import cache
 from pdoc._compat import formatannotation
 from pdoc._compat import is_typeddict
 from pdoc.doc_types import GenericAlias

pdoc/doc_ast.py

@@ -11,6 +11,7 @@
 from collections.abc import Iterator
 from dataclasses import dataclass
 import inspect
+from functools import cache
 from itertools import tee
 from itertools import zip_longest
 import types
@@ -23,8 +24,6 @@
 import pdoc
 
 from ._compat import ast_TypeAlias
-from ._compat import ast_unparse
-from ._compat import cache
 
 if TYPE_CHECKING:
     import pdoc.doc_types
@@ -81,7 +80,7 @@ def parse(obj):
 @cache
 def unparse(tree: ast.AST):
     """`ast.unparse`, but cached."""
-    return ast_unparse(tree)
+    return ast.unparse(tree)
 
 
 @dataclass

pdoc/doc_pyi.py

@@ -7,6 +7,7 @@
 from __future__ import annotations
 
 import importlib.util
+from functools import cache
 from pathlib import Path
 import sys
 import traceback
@@ -17,7 +18,6 @@
 
 from pdoc import doc
 
-from ._compat import cache
 
 overload_docstr = typing.overload(lambda: None).__doc__
 

pdoc/doc_types.py

@@ -14,6 +14,7 @@
 import sys
 import types
 from types import BuiltinFunctionType
+from types import GenericAlias
 from types import ModuleType
 import typing
 from typing import TYPE_CHECKING
@@ -24,7 +25,6 @@
 import warnings
 
 from . import extract
-from ._compat import GenericAlias
 from ._compat import UnionType
 from .doc_ast import type_checking_sections
 

pdoc/docstrings.py

@@ -17,13 +17,13 @@
 import inspect
 import mimetypes
 import os
+from functools import cache
 from pathlib import Path
 import re
 from textwrap import dedent
 from textwrap import indent
 import warnings
 
-from ._compat import cache
 
 
 @cache

pdoc/render_helpers.py

@@ -8,6 +8,7 @@
 import inspect
 import os
 import re
+from functools import cache
 from unittest.mock import patch
 import warnings
 
@@ -28,8 +29,6 @@
 import pdoc.markdown2
 
 from . import docstrings
-from ._compat import cache
-from ._compat import removesuffix
 
 lexer = pygments.lexers.PythonLexer()
 """
@@ -328,7 +327,7 @@ def linkify_repl(m: re.Match):
         plain_text = text.replace(
             '</span><span class="o">.</span><span class="n">', "."
         )
-        identifier = removesuffix(plain_text, "()")
+        identifier = plain_text.removesuffix("()")
         mod: pdoc.doc.Module = context["module"]
 
         # Check if this is a relative reference. These cannot be local and need to be resolved.
@@ -462,7 +461,7 @@ def link(context: Context, spec: tuple[str, str], text: str | None = None) -> st
     if mod.modulename == modulename:
         fullname = qualname
     else:
-        fullname = removesuffix(f"{modulename}.{qualname}", ".")
+        fullname = f"{modulename}.{qualname}".removesuffix(".")
 
     if qualname:
         qualname = f"#{qualname}"