Fix duplicate import and modernize type hints to use Python 3.10+ syntax

Co-authored-by: MightyHelper <32612290+MightyHelper@users.noreply.github.com>

Author: Copilot

pyproject.toml

@@ -11,16 +11,14 @@ authors = [
 description = "Interactive sorting utility for text lines with various sorting options"
 readme = "README.md"
 license = {text = "MIT"}
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
     "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Intended Audience :: End Users/Desktop",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -46,7 +44,7 @@ where = ["src"]
 # Ruff configuration
 [tool.ruff]
 line-length = 120
-target-version = "py38"
+target-version = "py310"
 
 [tool.ruff.lint]
 select = [
@@ -72,7 +70,7 @@ line-ending = "auto"
 
 # mypy configuration
 [tool.mypy]
-python_version = "3.8"
+python_version = "3.10"
 strict = true
 warn_return_any = true
 warn_unused_configs = true

src/interactive_sort/__init__.py

@@ -1,11 +1,9 @@
 """Interactive Sort - A tool for interactively sorting lines of text."""
 
-from typing import List
-
 __version__: str = "1.0.0"
 __author__: str = "MightyHelper"
 __description__: str = "Interactive sorting utility for text lines with various sorting options"
 
 from .main import InteractiveSort, main
 
-__all__: List[str] = ["InteractiveSort", "main"]
+__all__: list[str] = ["InteractiveSort", "main"]

src/interactive_sort/main.py

@@ -4,16 +4,16 @@
 import os
 import re
 import sys
+from collections.abc import Callable
 from functools import cmp_to_key
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union
-import re
+from typing import Any
 
 
 class InteractiveSort:
     def __init__(self, args: argparse.Namespace) -> None:
-        self.data: List[str] = []
+        self.data: list[str] = []
         self.args: argparse.Namespace = args
-        self.month_map: Dict[str, int] = {
+        self.month_map: dict[str, int] = {
             "JAN": 1,
             "FEB": 2,
             "MAR": 3,
@@ -32,7 +32,7 @@ def get_sort_key(self, item: str) -> str:
         """Generates a key for sorting based on the provided arguments."""
         key: str = item
         if self.args.field_separator:
-            fields: List[str] = key.split(self.args.field_separator)
+            fields: list[str] = key.split(self.args.field_separator)
             if fields:
                 key = fields[0]
             else:
@@ -48,28 +48,28 @@ def month_sort_key(self, item: str) -> int:
         """Extracts and converts the month from the beginning of the string (or first field)."""
         text_to_check: str = item
         if self.args.field_separator:
-            fields: List[str] = item.split(self.args.field_separator)
+            fields: list[str] = item.split(self.args.field_separator)
             if fields:
                 text_to_check = fields[0]
             else:
                 return 0
 
-        match: Optional[re.Match[str]] = re.match(r"^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)\s*", text_to_check, re.IGNORECASE)
+        match: re.Match[str] | None = re.match(r"^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)\s*", text_to_check, re.IGNORECASE)
         if match:
             return self.month_map.get(match.group(1).upper(), 0)  # 0 for unknown
         return 0  # Treat lines without a month at the beginning as "unknown"
 
-    def human_numeric_sort_key(self, item: str) -> Union[float, str]:
+    def human_numeric_sort_key(self, item: str) -> float | str:
         """Converts a human-readable number string to a comparable tuple (or from the first field)."""
         text_to_check: str = item
         if self.args.field_separator:
-            fields: List[str] = item.split(self.args.field_separator)
+            fields: list[str] = item.split(self.args.field_separator)
             if fields:
                 text_to_check = fields[0]
             else:
                 return item  # Fallback
 
-        parts: List[Tuple[str, str]] = re.findall(r"(\d+\.?\d*)([KMGTPEZY]?)", text_to_check, re.IGNORECASE)
+        parts: list[tuple[str, str]] = re.findall(r"(\d+\.?\d*)([KMGTPEZY]?)", text_to_check, re.IGNORECASE)
         if parts:
             value_str: str
             unit: str
@@ -98,11 +98,11 @@ def human_numeric_sort_key(self, item: str) -> Union[float, str]:
         except ValueError:
             return text_to_check  # Keep original string if not convertible to number
 
-    def numeric_sort_key(self, item: str) -> Union[float, str]:
+    def numeric_sort_key(self, item: str) -> float | str:
         """Tries to convert the item (or first field) to a float for numeric sorting."""
         text_to_check: str = item
         if self.args.field_separator:
-            fields: List[str] = item.split(self.args.field_separator)
+            fields: list[str] = item.split(self.args.field_separator)
             if fields:
                 text_to_check = fields[0]
             else:
@@ -122,16 +122,16 @@ def compare_items(self, item1: str, item2: str) -> int:
                 return key1 - key2
 
         if self.args.human_numeric_sort:
-            key1_human: Union[float, str] = self.human_numeric_sort_key(item1)
-            key2_human: Union[float, str] = self.human_numeric_sort_key(item2)
-            if isinstance(key1_human, (int, float)) and isinstance(key2_human, (int, float)):
+            key1_human: float | str = self.human_numeric_sort_key(item1)
+            key2_human: float | str = self.human_numeric_sort_key(item2)
+            if isinstance(key1_human, int | float) and isinstance(key2_human, int | float):
                 if key1_human != key2_human:
                     return int(key1_human - key2_human)
 
         if self.args.numeric_sort:
-            key1_numeric: Union[float, str] = self.numeric_sort_key(item1)
-            key2_numeric: Union[float, str] = self.numeric_sort_key(item2)
-            if isinstance(key1_numeric, (int, float)) and isinstance(key2_numeric, (int, float)):
+            key1_numeric: float | str = self.numeric_sort_key(item1)
+            key2_numeric: float | str = self.numeric_sort_key(item2)
+            if isinstance(key1_numeric, int | float) and isinstance(key2_numeric, int | float):
                 if key1_numeric != key2_numeric:
                     return int(key1_numeric - key2_numeric)
 
@@ -148,10 +148,7 @@ def compare_items(self, item1: str, item2: str) -> int:
     def add_item(self, item: str) -> None:
         """Adds an item to the sorted data using a custom comparison."""
         if not self.args.month_sort and not self.args.human_numeric_sort and not self.args.numeric_sort:
-
-            def key_func(x: str) -> str:
-                return self.get_sort_key(x)
-
+            key_func: Callable[[str], Any] = self.get_sort_key
         else:
             key_func = cmp_to_key(self.compare_items)
 
@@ -165,7 +162,7 @@ def display_sorted(self) -> None:
             os.system("cls" if os.name == "nt" else "clear")
 
         print("--- Interactive Sorted Data ---", file=output_stream)
-        items_to_display: List[str] = self.data
+        items_to_display: list[str] = self.data
         if self.args.unique:
             items_to_display = sorted(
                 set(items_to_display), key=lambda x: self.data.index(x)
@@ -179,7 +176,7 @@ def display_sorted(self) -> None:
 
     def output_final_sorted(self) -> None:
         """Outputs the final sorted data to stdout (used when stderr flag is set)."""
-        items_to_display: List[str] = self.data
+        items_to_display: list[str] = self.data
         if self.args.unique:
             items_to_display = sorted(
                 set(items_to_display), key=lambda x: self.data.index(x)

tox.ini

@@ -1,11 +1,9 @@
 [tox]
-envlist = py38,py39,py310,py311,py312,lint,format-check,mypy
+envlist = py310,py311,py312,lint,format-check,mypy
 isolated_build = true
 
 [gh-actions]
 python =
-    3.8: py38
-    3.9: py39
     3.10: py310
     3.11: py311
     3.12: py312