Update to Python 3.10+ type hints and regenerate lockfile

Author: nukeop

node/flatpak_node_generator/providers/pnpm.py

@@ -2,16 +2,11 @@
 import re
 import sys
 import types
+from collections.abc import Iterator
 from pathlib import Path
 from typing import (
     Any,
-    Dict,
-    Iterator,
-    List,
     NamedTuple,
-    Optional,
-    Tuple,
-    Type,
 )
 
 import yaml
@@ -33,7 +28,7 @@
 _V6_FORMAT_VERSIONS = {6, 7}
 _SUPPORTED_VERSIONS = {6, 7, 9}
 
-_STORE_VERSION_BY_LOCKFILE: Dict[int, str] = {
+_STORE_VERSION_BY_LOCKFILE: dict[int, str] = {
     6: 'v3',
     7: 'v3',
     9: 'v10',
@@ -60,7 +55,7 @@ def _get_tarball_url(
         self,
         name: str,
         version: str,
-        resolution: Dict[str, Any],
+        resolution: dict[str, Any],
     ) -> str:
         if 'tarball' in resolution:
             return str(resolution['tarball'])
@@ -72,7 +67,7 @@ def _get_tarball_url(
 
         return f'{self.registry}/{name}/-/{basename}-{version}.tgz'
 
-    def _parse_package_key(self, key: str, major: int) -> Optional[Tuple[str, str]]:
+    def _parse_package_key(self, key: str, major: int) -> tuple[str, str] | None:
         if major in _V6_FORMAT_VERSIONS:
             match = self._V6_PACKAGE_RE.match(key)
         else:
@@ -107,7 +102,7 @@ def process_lockfile(self, lockfile_path: Path) -> Iterator[Package]:
 
         lockfile = Lockfile(lockfile_path, major)
 
-        packages_dict: Dict[str, Any] = data.get('packages', {})
+        packages_dict: dict[str, Any] = data.get('packages', {})
         if not packages_dict:
             return
 
@@ -125,7 +120,7 @@ def process_lockfile(self, lockfile_path: Path) -> Iterator[Package]:
             if self.no_devel and info.get('dev', False):
                 continue
 
-            resolution: Dict[str, Any] = info.get('resolution', {})
+            resolution: dict[str, Any] = info.get('resolution', {})
             if not resolution:
                 continue
 
@@ -173,14 +168,14 @@ def __init__(
         self.lockfile_root = lockfile_root
         self.tarball_dir = self.gen.data_root / 'pnpm-tarballs'
         self.store_dir = self.gen.data_root / 'pnpm-store'
-        self._tarballs: List[PnpmModuleProvider._TarballInfo] = []
-        self._store_version: Optional[str] = None
+        self._tarballs: list[PnpmModuleProvider._TarballInfo] = []
+        self._store_version: str | None = None
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        tb: Optional[types.TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        tb: types.TracebackType | None,
     ) -> None:
         if exc_type is None:
             self._finalize()
@@ -281,7 +276,7 @@ def __init__(
     def create_lockfile_provider(self) -> PnpmLockfileProvider:
         return PnpmLockfileProvider(self.options.lockfile)
 
-    def create_rcfile_providers(self) -> List[RCFileProvider]:
+    def create_rcfile_providers(self) -> list[RCFileProvider]:
         return [NpmRCFileProvider()]
 
     def create_module_provider(