Reformat files with project:fix for later resolving vulnerabilities (#578)

Author: ArBridgeman

doc/changes/unreleased.md

@@ -1,12 +1,9 @@
 # Unreleased
 
-## 🔧 Changed
-
-- #558 Updated to poetry 2.1.2 & relocked dependencies to resolve CVE-2025-27516
-- Relocked dependencies to resolve CVE-2025-43859
-
 ## 🧰 Internal
 
+- #558 Updated to poetry 2.1.2 & relocked dependencies to resolve CVE-2025-27516
 - #548: Replaced pytest-exasol-itde with pytest-backend
+- - Relocked dependencies to resolve CVE-2025-43859
 - #564: Replaced nox test:unit with that from exasol-toolbox
-
+- Reformatted files to meet project specifications

exasol/odbc.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
 import os
-from contextlib import contextmanager
-from pathlib import Path
-from tempfile import TemporaryDirectory
-from textwrap import dedent
-from typing import (
+from collections.abc import (
     Iterable,
     Iterator,
     MutableMapping,
 )
+from contextlib import contextmanager
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from textwrap import dedent
 
 from pyodbc import Connection
 

noxconfig.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Iterable
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Iterable
 
 from exasol.toolbox.nox.plugin import hookimpl
 

scripts/links.py

@@ -1,10 +1,12 @@
 import subprocess
 import urllib.error
+from collections.abc import (
+    Container,
+    Iterable,
+)
 from itertools import repeat
 from pathlib import Path
 from typing import (
-    Container,
-    Iterable,
     Optional,
     Tuple,
 )
@@ -21,7 +23,7 @@ def _deny_filter(path: Path) -> bool:
     return filter(lambda path: _deny_filter(path), docs)
 
 
-def urls(files: Iterable[Path]) -> Iterable[Tuple[Path, str]]:
+def urls(files: Iterable[Path]) -> Iterable[tuple[Path, str]]:
     """Returns an iterable over all urls contained in the provided files"""
 
     def should_filter(url: str) -> bool:
@@ -41,7 +43,7 @@ def should_filter(url: str) -> bool:
         yield from zip(repeat(file), filter(lambda url: not should_filter(url), _urls))
 
 
-def check(url: str) -> Tuple[Optional[int], str]:
+def check(url: str) -> tuple[Optional[int], str]:
     """Checks if an url is still working (can be accessed)"""
     try:
         # User-Agent needs to be faked otherwise some webpages will deny access with a 403

scripts/report.py

@@ -7,11 +7,13 @@
     FileType,
 )
 from collections import namedtuple
+from collections.abc import (
+    Generator,
+    Iterable,
+)
 from typing import (
     Any,
     Dict,
-    Generator,
-    Iterable,
     TextIO,
 )
 
@@ -27,7 +29,7 @@
 )
 
 
-def skipped_test_from(obj: Dict[str, Any]) -> Test:
+def skipped_test_from(obj: dict[str, Any]) -> Test:
     for stage in ("setup", "call", "teardown"):
         try:
             filename, _, details = eval(obj[stage]["longrepr"])
@@ -74,7 +76,7 @@ def _human(tests: Iterable[Test], output: TextIO) -> None:
 def _csv(tests: Iterable[Test], output: TextIO) -> None:
     fields = ("test-case", "status", "details")
 
-    def test_to_entry(t: Test) -> Dict[str, Any]:
+    def test_to_entry(t: Test) -> dict[str, Any]:
         return {
             "test-case": t.nodeid,
             "status": t.outcome,
@@ -88,7 +90,7 @@ def test_to_entry(t: Test) -> Dict[str, Any]:
 
 
 def main(
-    test_results: str, output: TextIO, format: str, **kwargs: Dict[str, Any]
+    test_results: str, output: TextIO, format: str, **kwargs: dict[str, Any]
 ) -> int:
     skipped_tests = all_skipped_tests(test_results)
     dispatcher = {"human": _human, "csv": _csv}

scripts/version_check.py

@@ -5,13 +5,13 @@
     Namespace,
 )
 from collections import namedtuple
+from collections.abc import Iterable
 from inspect import cleandoc
 from pathlib import Path
 from shutil import which
 from typing import (
     Any,
     Dict,
-    Iterable,
     Union,
 )
 
@@ -50,8 +50,8 @@ class CommitHookError(Exception):
 def version_from_python_module(path: Path) -> Version:
     """Retrieve version information from the `version` module"""
     with open(path) as file:
-        _locals: Dict[str, Any] = {}
-        _globals: Dict[str, Any] = {}
+        _locals: dict[str, Any] = {}
+        _globals: dict[str, Any] = {}
         exec(file.read(), _locals, _globals)
 
         try:

sqlalchemy_exasol/base.py

@@ -48,11 +48,6 @@
 import logging
 import re
 from contextlib import closing
-from datetime import (
-    date,
-    datetime,
-)
-from decimal import Decimal
 
 import sqlalchemy.exc
 from sqlalchemy import (
@@ -551,7 +546,8 @@
     "CLOB": sqltypes.TEXT,
     "DATE": sqltypes.DATE,
     "DECIMAL": sqltypes.DECIMAL,
-    "DOUBLE": sqltypes.FLOAT,  # EXASOL mapps DOUBLE, DOUBLE PRECISION, FLOAT to DOUBLE PRECISION
+    "DOUBLE": sqltypes.FLOAT,
+    # EXASOL mapps DOUBLE, DOUBLE PRECISION, FLOAT to DOUBLE PRECISION
     # internally but returns 'DOUBLE' as type when asking the DB catalog
     # INTERVAL DAY [(p)] TO SECOND [(fp)] TODO: missing support for EXA Datatype, check Oracle Engine
     # INTERVAL YEAR[(p)] TO MONTH         TODO: missing support for EXA Datatype, check Oracle Engine