Modernize types to Python 3.10+ style

Author: elopez

pyproject.toml

@@ -61,7 +61,7 @@ solc-select = "solc_select.__main__:solc_select"
 solc = "solc_select.__main__:solc"
 
 [tool.ruff]
-target-version = "py38"
+target-version = "py310"
 line-length = 100
 
 [tool.ruff.lint]

solc_select/__main__.py

@@ -1,6 +1,5 @@
 import argparse
 import sys
-from typing import List
 
 from .constants import (
     INSTALL_COMMAND,
@@ -23,7 +22,7 @@
 from .utils import sort_versions
 
 
-def solc_select_install(service: SolcService, versions: List[str]) -> None:
+def solc_select_install(service: SolcService, versions: list[str]) -> None:
     """Handle the install command."""
     if not versions:
         print("Available versions to install:")

solc_select/exceptions.py

@@ -5,8 +5,6 @@
 and more informative error messages throughout the application.
 """
 
-from typing import List, Optional
-
 
 class SolcSelectError(Exception):
     """Base exception for all solc-select errors."""
@@ -20,8 +18,8 @@ class VersionNotFoundError(SolcSelectError):
     def __init__(
         self,
         version: str,
-        available_versions: Optional[List[str]] = None,
-        suggestion: Optional[str] = None,
+        available_versions: list[str] | None = None,
+        suggestion: str | None = None,
     ):
         self.version = version
         self.available_versions = available_versions or []
@@ -47,8 +45,8 @@ class VersionNotInstalledError(SolcSelectError):
     def __init__(
         self,
         version: str,
-        installed_versions: Optional[List[str]] = None,
-        source: Optional[str] = None,
+        installed_versions: list[str] | None = None,
+        source: str | None = None,
     ):
         self.version = version
         self.installed_versions = installed_versions or []
@@ -73,7 +71,7 @@ def __init__(
 class PlatformNotSupportedError(SolcSelectError):
     """Raised when platform is not supported for a specific version."""
 
-    def __init__(self, version: str, platform: str, min_version: Optional[str] = None):
+    def __init__(self, version: str, platform: str, min_version: str | None = None):
         self.version = version
         self.platform = platform
         self.min_version = min_version
@@ -115,7 +113,7 @@ class NetworkError(SolcSelectError):
     """Raised when network operations fail."""
 
     def __init__(
-        self, operation: str, url: Optional[str] = None, original_error: Optional[Exception] = None
+        self, operation: str, url: str | None = None, original_error: Exception | None = None
     ):
         self.operation = operation
         self.url = url

solc_select/infrastructure/filesystem.py

@@ -8,7 +8,6 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Optional
 
 from ..constants import ARTIFACTS_DIR, SOLC_SELECT_DIR
 from ..models import SolcVersion
@@ -27,7 +26,7 @@ def _ensure_directories(self) -> None:
         self.artifacts_dir.mkdir(parents=True, exist_ok=True)
         self.config_dir.mkdir(parents=True, exist_ok=True)
 
-    def get_current_version(self) -> Optional[SolcVersion]:
+    def get_current_version(self) -> SolcVersion | None:
         """Get the currently selected version.
 
         Returns:

solc_select/infrastructure/http_client.py

@@ -5,7 +5,8 @@
 retry logic and proper timeout handling.
 """
 
-from typing import Any, Mapping, Optional, Tuple, Union
+from collections.abc import Mapping
+from typing import Any
 
 import requests
 from requests.adapters import HTTPAdapter
@@ -22,10 +23,10 @@ def send(
         self,
         request: PreparedRequest,
         stream: bool = False,
-        timeout: Union[float, Tuple[float, float], Tuple[float, None], None] = None,
-        verify: Union[bool, str] = True,
-        cert: Union[bytes, str, Tuple[Union[bytes, str], Union[bytes, str]], None] = None,
-        proxies: Optional[Mapping[str, str]] = None,
+        timeout: float | tuple[float, float] | tuple[float, None] | None = None,
+        verify: bool | str = True,
+        cert: bytes | str | tuple[bytes | str, bytes | str] | None = None,
+        proxies: Mapping[str, str] | None = None,
     ) -> Response:
         timeout = timeout or self.timeout
         return super().send(

solc_select/models.py

@@ -10,7 +10,6 @@
 import sys
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional
 
 from packaging.version import Version
 
@@ -257,7 +256,7 @@ class SolcArtifact:
     platform: Platform
     download_url: str
     checksum_sha256: str
-    checksum_keccak256: Optional[str]
+    checksum_keccak256: str | None
     file_path: Path
 
     def __post_init__(self) -> None:

solc_select/repositories.py

@@ -7,7 +7,7 @@
 
 from abc import ABC, abstractmethod
 from functools import lru_cache
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any
 
 import requests
 from packaging.version import Version
@@ -44,7 +44,7 @@ def list_url(self) -> str:
         pass
 
     @lru_cache(maxsize=5)  # noqa: B019
-    def _fetch_list_json(self) -> Dict[str, Any]:
+    def _fetch_list_json(self) -> dict[str, Any]:
         """Fetch and cache the list.json data from the repository.
 
         Returns:
@@ -56,7 +56,7 @@ def _fetch_list_json(self) -> Dict[str, Any]:
 
     @property
     @lru_cache(maxsize=5)  # noqa: B019
-    def available_versions(self) -> Dict[str, str]:
+    def available_versions(self) -> dict[str, str]:
         """Get available versions as a dict of version -> artifact_filename."""
         list_data = self._fetch_list_json()
         all_releases = list_data["releases"]
@@ -77,7 +77,7 @@ def latest_version(self) -> SolcVersion:
         version_objs = [SolcVersion.parse(v) for v in versions]
         return max(version_objs)
 
-    def _filter_versions(self, releases: Dict[str, str]) -> Dict[str, str]:
+    def _filter_versions(self, releases: dict[str, str]) -> dict[str, str]:
         """Filter versions based on repository-specific criteria.
 
         Override this method to apply custom filtering logic.
@@ -89,7 +89,7 @@ def get_download_url(self, version: SolcVersion, artifact_filename: str) -> str:
         """Get the download URL for a specific version."""
         return f"{self.base_url}{artifact_filename}"
 
-    def get_checksums(self, version: SolcVersion) -> Tuple[str, Optional[str]]:
+    def get_checksums(self, version: SolcVersion) -> tuple[str, str | None]:
         """Get SHA256 and optional Keccak256 checksums for a version."""
         list_data = self._fetch_list_json()
         builds = list_data["builds"]
@@ -191,7 +191,7 @@ def base_url(self) -> str:
     def list_url(self) -> str:
         return ALLOY_SOLC_JSON
 
-    def _filter_versions(self, releases: Dict[str, str]) -> Dict[str, str]:
+    def _filter_versions(self, releases: dict[str, str]) -> dict[str, str]:
         """Filter to only include versions in the supported ARM64 range."""
         min_version = Version(ALLOY_ARM64_MIN_VERSION)
         max_version = Version(ALLOY_ARM64_MAX_VERSION)
@@ -219,7 +219,7 @@ class CompositeRepository:
 
     def __init__(self, platform: Platform, session: requests.Session):
         self.platform = platform
-        self.repositories: List[AbstractSolcRepository] = []
+        self.repositories: list[AbstractSolcRepository] = []
 
         # Always include the main soliditylang repository
         self.repositories.append(SoliditylangRepository(platform, session))
@@ -233,7 +233,7 @@ def __init__(self, platform: Platform, session: requests.Session):
 
     @property
     @lru_cache(maxsize=5)  # noqa: B019
-    def available_versions(self) -> Dict[str, str]:
+    def available_versions(self) -> dict[str, str]:
         """Get all available versions from all repositories."""
         all_versions = {}
 

solc_select/services/artifact_manager.py

@@ -11,7 +11,6 @@
 from functools import partial
 from io import BufferedRandom
 from pathlib import Path
-from typing import List
 from zipfile import ZipFile
 
 import requests
@@ -33,7 +32,7 @@ def __init__(
         self.platform = platform
         self.session = session
 
-    def get_installed_versions(self) -> List[SolcVersion]:
+    def get_installed_versions(self) -> list[SolcVersion]:
         """Get list of installed versions.
 
         Returns:
@@ -260,7 +259,7 @@ def _extract_zip_archive(self, artifact: SolcArtifact) -> None:
         # Make executable
         artifact.file_path.chmod(0o775)
 
-    def install_versions(self, versions: List[SolcVersion], silent: bool = False) -> bool:
+    def install_versions(self, versions: list[SolcVersion], silent: bool = False) -> bool:
         """Install multiple versions concurrently.
 
         Args:

solc_select/services/platform_service.py

@@ -8,7 +8,6 @@
 import contextlib
 import sys
 from pathlib import Path
-from typing import List
 
 from ..constants import SOLC_SELECT_DIR
 from ..models import Platform, SolcVersion
@@ -20,7 +19,7 @@ class PlatformService:
     def __init__(self, platform: Platform):
         self.platform = platform
 
-    def get_emulation_prefix(self) -> List[str]:
+    def get_emulation_prefix(self) -> list[str]:
         """Get the command prefix for emulation if needed.
 
         Returns:

solc_select/services/solc_service.py

@@ -7,7 +7,6 @@
 
 import subprocess
 import sys
-from typing import List, Optional, Tuple
 
 from ..exceptions import (
     ArchitectureUpgradeError,
@@ -29,7 +28,7 @@
 class SolcService:
     """Main service facade for solc-select operations."""
 
-    def __init__(self, platform: Optional[Platform] = None):
+    def __init__(self, platform: Platform | None = None):
         if platform is None:
             platform = Platform.current()
 
@@ -41,7 +40,7 @@ def __init__(self, platform: Optional[Platform] = None):
         self.artifact_manager = ArtifactManager(self.repository, platform, self.session)
         self.platform_service = PlatformService(platform)
 
-    def get_current_version(self) -> Tuple[Optional[SolcVersion], str]:
+    def get_current_version(self) -> tuple[SolcVersion | None, str]:
         """Get the current version and its source.
 
         Returns:
@@ -65,16 +64,16 @@ def get_current_version(self) -> Tuple[Optional[SolcVersion], str]:
 
         return version, source
 
-    def get_installed_versions(self) -> List[SolcVersion]:
+    def get_installed_versions(self) -> list[SolcVersion]:
         """Get list of installed versions."""
         return self.artifact_manager.get_installed_versions()
 
-    def get_installable_versions(self) -> List[SolcVersion]:
+    def get_installable_versions(self) -> list[SolcVersion]:
         """Get versions that can be installed."""
         installed = self.get_installed_versions()
         return self.version_manager.get_installable_versions(installed)
 
-    def install_versions(self, version_strings: List[str], silent: bool = False) -> bool:
+    def install_versions(self, version_strings: list[str], silent: bool = False) -> bool:
         """Install one or more versions.
 
         Args:
@@ -180,7 +179,7 @@ def upgrade_architecture(self) -> None:
         else:
             print("solc-select is already up to date")
 
-    def execute_solc(self, args: List[str]) -> None:
+    def execute_solc(self, args: list[str]) -> None:
         """Execute solc with the current version.
 
         Args: