Update type imports for generics

panel/chat/feed.py

@@ -8,14 +8,15 @@
 import asyncio
 import traceback
 
+from collections.abc import Callable
 from enum import Enum
 from inspect import (
     getfullargspec, isasyncgen, isasyncgenfunction, isawaitable,
     iscoroutinefunction, isgenerator, isgeneratorfunction, ismethod,
 )
 from io import BytesIO
 from typing import (
-    TYPE_CHECKING, Any, Callable, ClassVar, Literal,
+    TYPE_CHECKING, Any, ClassVar, Literal,
 )
 
 import param

panel/chat/input.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from typing import (
-    TYPE_CHECKING, Any, ClassVar, Mapping,
-)
+from collections.abc import Mapping
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import param
 

panel/chat/interface.py

@@ -6,10 +6,11 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 from dataclasses import dataclass
 from functools import partial
 from io import BytesIO
-from typing import Any, Callable, ClassVar
+from typing import Any, ClassVar
 
 import param
 

panel/chat/message.py

@@ -6,13 +6,14 @@
 
 import datetime
 
+from collections.abc import Callable
 from contextlib import ExitStack
 from dataclasses import dataclass
 from functools import partial
 from io import BytesIO
 from tempfile import NamedTemporaryFile
 from typing import (
-    TYPE_CHECKING, Any, Callable, ClassVar, Union,
+    TYPE_CHECKING, Any, ClassVar, Union,
 )
 from zoneinfo import ZoneInfo
 

panel/chat/step.py

@@ -2,7 +2,8 @@
 
 import traceback
 
-from typing import ClassVar, Literal, Mapping
+from collections.abc import Mapping
+from typing import ClassVar, Literal
 
 import param
 

panel/custom.py

@@ -10,9 +10,10 @@
 import textwrap
 
 from collections import defaultdict
+from collections.abc import Callable, Mapping
 from functools import partial
 from typing import (
-    TYPE_CHECKING, Any, Callable, ClassVar, Literal, Mapping,
+    TYPE_CHECKING, Any, ClassVar, Literal,
 )
 
 import param

panel/entry_points.py

@@ -6,7 +6,7 @@
 
 import importlib.metadata
 
-from typing import Iterator
+from collections.abc import Iterator
 
 
 def entry_points_for(group: str) -> Iterator[importlib.metadata.EntryPoint]:

panel/io/application.py

@@ -7,11 +7,10 @@
 import logging
 import os
 
+from collections.abc import Callable, Sequence
 from functools import partial
 from types import FunctionType, MethodType
-from typing import (
-    TYPE_CHECKING, Any, Callable, Sequence, TypeAlias,
-)
+from typing import TYPE_CHECKING, Any, TypeAlias
 from urllib.parse import urljoin
 
 import bokeh.command.util

panel/io/browser.py

@@ -4,7 +4,8 @@
 """
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, ClassVar, Mapping
+from collections.abc import Mapping
+from typing import TYPE_CHECKING, ClassVar
 
 import param  # type: ignore
 

panel/io/cache.py

@@ -16,10 +16,10 @@
 import time
 import unittest.mock
 
+from collections.abc import Awaitable, Callable, Hashable
 from contextlib import contextmanager
 from typing import (
-    TYPE_CHECKING, Any, Awaitable, Callable, Hashable, Literal, ParamSpec,
-    Protocol, TypeVar, cast, overload,
+    TYPE_CHECKING, Any, Literal, ParamSpec, Protocol, TypeVar, cast, overload,
 )
 
 import param

panel/io/compile.py

@@ -65,7 +65,7 @@ def setup_build_dir(build_dir: str | os.PathLike | None = None):
 
 def check_cli_tool(tool_name):
     try:
-        result = subprocess.run([tool_name, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        result = subprocess.run([tool_name, '--version'], capture_output=True)
         if result.returncode == 0:
             return True
         else:

panel/io/convert.py

@@ -7,9 +7,8 @@
 import pathlib
 import uuid
 
-from typing import (
-    IO, Any, Literal, Sequence,
-)
+from collections.abc import Sequence
+from typing import IO, Any, Literal
 
 import bokeh
 

panel/io/document.py

@@ -12,11 +12,10 @@
 import time
 import weakref
 
+from collections.abc import Callable, Iterator, Sequence
 from contextlib import contextmanager
 from functools import partial, wraps
-from typing import (
-    TYPE_CHECKING, Any, Callable, Iterator, Sequence,
-)
+from typing import TYPE_CHECKING, Any
 from weakref import WeakKeyDictionary
 
 from bokeh.application.application import SessionContext

panel/io/handlers.py

@@ -11,11 +11,10 @@
 import traceback
 import urllib.parse as urlparse
 
+from collections.abc import Callable, Iterator
 from contextlib import contextmanager
 from types import ModuleType
-from typing import (
-    IO, TYPE_CHECKING, Any, Callable, Iterator,
-)
+from typing import IO, TYPE_CHECKING, Any
 
 import bokeh.command.util
 

panel/io/jupyter_server_extension.py

@@ -33,8 +33,9 @@
 import textwrap
 import time
 
+from collections.abc import Awaitable
 from queue import Empty
-from typing import Any, Awaitable
+from typing import Any
 from urllib.parse import urljoin
 
 import tornado

panel/io/location.py

@@ -6,9 +6,8 @@
 import json
 import urllib.parse as urlparse
 
-from typing import (
-    TYPE_CHECKING, Any, Callable, ClassVar, Mapping,
-)
+from collections.abc import Callable, Mapping
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import param
 

panel/io/model.py

@@ -5,10 +5,9 @@
 
 import textwrap
 
+from collections.abc import Iterable, Sequence
 from contextlib import contextmanager
-from typing import (
-    TYPE_CHECKING, Any, Iterable, Sequence,
-)
+from typing import TYPE_CHECKING, Any
 
 import numpy as np
 

panel/io/notebook.py

@@ -10,11 +10,10 @@
 import uuid
 import warnings
 
+from collections.abc import Iterator
 from contextlib import contextmanager
 from functools import partial
-from typing import (
-    TYPE_CHECKING, Any, Iterator, Literal,
-)
+from typing import TYPE_CHECKING, Any, Literal
 
 import bokeh
 import bokeh.embed.notebook

panel/io/profile.py

@@ -6,11 +6,12 @@
 import tempfile
 import uuid
 
+from collections.abc import Callable, Iterator, Sequence
 from contextlib import contextmanager
 from cProfile import Profile
 from functools import wraps
 from typing import (
-    TYPE_CHECKING, Callable, Iterator, Literal, ParamSpec, Sequence, TypeVar,
+    TYPE_CHECKING, Literal, ParamSpec, TypeVar,
 )
 
 from ..config import config

panel/io/pyodide.py

@@ -8,7 +8,8 @@
 import sys
 import uuid
 
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 
 import bokeh
 import js

panel/io/save.py

@@ -6,9 +6,8 @@
 import io
 import os
 
-from typing import (
-    IO, TYPE_CHECKING, Any, Iterable,
-)
+from collections.abc import Iterable
+from typing import IO, TYPE_CHECKING, Any
 
 import bokeh
 

panel/io/server.py

@@ -14,11 +14,10 @@
 import sys
 import uuid
 
+from collections.abc import Callable, Mapping
 from functools import partial, wraps
 from html import escape
-from typing import (
-    TYPE_CHECKING, Any, Callable, Mapping, TypedDict,
-)
+from typing import TYPE_CHECKING, Any, TypedDict
 from urllib.parse import urlparse
 
 import bokeh

panel/io/state.py

@@ -14,13 +14,14 @@
 import time
 
 from collections import Counter, defaultdict
-from collections.abc import Iterator
+from collections.abc import (
+    Callable, Coroutine, Hashable, Iterator, Iterator as TIterator,
+)
 from contextlib import contextmanager, suppress
 from contextvars import ContextVar
 from functools import partial, wraps
 from typing import (
-    TYPE_CHECKING, Any, Callable, ClassVar, Coroutine, Hashable,
-    Iterator as TIterator, Literal, TypeVar, Union,
+    TYPE_CHECKING, Any, ClassVar, Literal, TypeAlias, TypeVar,
 )
 from urllib.parse import urljoin
 from weakref import WeakKeyDictionary
@@ -89,7 +90,7 @@ def curdoc_locked() -> Document | None:
 
 class _Undefined: pass
 
-Tat = Union[dt.datetime, Callable[[dt.datetime], dt.datetime], TIterator[dt.datetime]]
+Tat: TypeAlias = dt.datetime | Callable[[dt.datetime], dt.datetime], TIterator[dt.datetime]
 
 class _state(param.Parameterized):
     """

panel/layout/accordion.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from typing import (
-    TYPE_CHECKING, Callable, ClassVar, Mapping,
-)
+from collections.abc import Callable, Mapping
+from typing import TYPE_CHECKING, ClassVar
 
 import param
 

panel/layout/base.py

@@ -5,9 +5,10 @@
 from __future__ import annotations
 
 from collections import defaultdict, namedtuple
-from typing import (
-    TYPE_CHECKING, Any, ClassVar, Generator, Iterable, Iterator, Mapping,
+from collections.abc import (
+    Generator, Iterable, Iterator, Mapping,
 )
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import param
 

panel/layout/card.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
-from typing import (
-    TYPE_CHECKING, Callable, ClassVar, Mapping,
-)
+from collections.abc import Callable, Mapping
+from typing import TYPE_CHECKING, ClassVar
 
 import param
 

panel/layout/feed.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, ClassVar, Mapping
+from collections.abc import Mapping
+from typing import TYPE_CHECKING, ClassVar
 
 import param
 

panel/layout/grid.py

@@ -6,10 +6,9 @@
 import math
 
 from collections import namedtuple
+from collections.abc import Mapping
 from functools import partial
-from typing import (
-    TYPE_CHECKING, Any, ClassVar, Mapping,
-)
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import numpy as np
 import param

panel/layout/gridstack.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing import ClassVar, Mapping
+from collections.abc import Mapping
+from typing import ClassVar
 
 import param
 

panel/layout/tabs.py

@@ -4,7 +4,8 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from typing import TYPE_CHECKING, ClassVar, Mapping
+from collections.abc import Mapping
+from typing import TYPE_CHECKING, ClassVar
 
 import param
 

panel/links.py

@@ -7,9 +7,8 @@
 import sys
 import weakref
 
-from typing import (
-    TYPE_CHECKING, Any, Iterable, Sequence, TypeAlias,
-)
+from collections.abc import Iterable, Sequence
+from typing import TYPE_CHECKING, Any, TypeAlias
 
 import param
 

panel/pane/alert.py

@@ -5,7 +5,8 @@
 """
 from __future__ import annotations
 
-from typing import Any, ClassVar, Mapping
+from collections.abc import Mapping
+from typing import Any, ClassVar
 
 import param