Minor typing fixes

Author: GjjvdBurg

clevercsv/_types.py

@@ -9,17 +9,24 @@
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import Mapping
-from typing import Type
 from typing import TypeVar
 from typing import Union
 
+import _csv
+
 from clevercsv.dialect import SimpleDialect
 
 AnyPath = Union[str, bytes, "os.PathLike[str]", "os.PathLike[bytes]"]
 StrPath = Union[str, "os.PathLike[str]"]
 _OpenFile = Union[AnyPath, int]
 _DictRow = Mapping[str, Any]
-_DialectLike = Union[str, csv.Dialect, Type[csv.Dialect], SimpleDialect]
+_DialectLike = Union[
+    str,
+    csv.Dialect,
+    _csv.Dialect,
+    type[_csv.Dialect],
+    SimpleDialect,
+]
 _T = TypeVar("_T")
 
 if sys.version_info >= (3, 8):

clevercsv/dialect.py

@@ -16,9 +16,10 @@
 from typing import Dict
 from typing import Optional
 from typing import Tuple
-from typing import Type
 from typing import Union
 
+import _csv
+
 excel = csv.excel
 excel_tab = csv.excel_tab
 unix_dialect = csv.unix_dialect
@@ -84,7 +85,7 @@ def validate(self) -> None:
 
     @classmethod
     def from_dict(
-        cls: Type["SimpleDialect"], d: Dict[str, Any]
+        cls: type["SimpleDialect"], d: Dict[str, Any]
     ) -> "SimpleDialect":
         dialect = cls(
             d["delimiter"], d["quotechar"], d["escapechar"], strict=d["strict"]
@@ -93,7 +94,7 @@ def from_dict(
 
     @classmethod
     def from_csv_dialect(
-        cls: Type["SimpleDialect"], d: csv.Dialect
+        cls: type["SimpleDialect"], d: _csv.Dialect | csv.Dialect
     ) -> "SimpleDialect":
         delimiter = "" if d.delimiter is None else d.delimiter
         quotechar = "" if d.quoting == csv.QUOTE_NONE else d.quotechar
@@ -132,7 +133,7 @@ def serialize(self) -> str:
         return json.dumps(self.to_dict())
 
     @classmethod
-    def deserialize(cls: Type["SimpleDialect"], obj: str) -> "SimpleDialect":
+    def deserialize(cls: type["SimpleDialect"], obj: str) -> "SimpleDialect":
         """Deserialize dialect from a JSON object"""
         return cls.from_dict(json.loads(obj))
 

clevercsv/write.py

@@ -15,7 +15,8 @@
 from typing import TYPE_CHECKING
 from typing import Any
 from typing import Iterable
-from typing import Type
+
+import _csv
 
 if TYPE_CHECKING:
     from clevercsv._types import SupportsWrite
@@ -45,18 +46,18 @@ def __init__(
         **fmtparams: Any,
     ) -> None:
         self.original_dialect = dialect
-        self.dialect: Type[csv.Dialect] = self._make_python_dialect(
+        self.dialect: type[_csv.Dialect] = self._make_python_dialect(
             dialect, **fmtparams
         )
-        self._writer = csv.writer(csvfile, dialect=self.dialect)
+        self._writer = _csv.writer(csvfile, dialect=self.dialect)
 
     def _make_python_dialect(
         self, dialect: _DialectLike, **fmtparams: Any
-    ) -> Type[csv.Dialect]:
+    ) -> type[_csv.Dialect]:
         d: _DialectLike = ""
         if isinstance(dialect, str):
-            d = csv.get_dialect(dialect)
-        elif isinstance(dialect, csv.Dialect):
+            d = _csv.get_dialect(dialect)
+        elif isinstance(dialect, _csv.Dialect):
             d = dialect
         elif isinstance(dialect, SimpleDialect):
             d = dialect.to_csv_dialect()

tests/test_unit/test_write.py

@@ -14,7 +14,6 @@
 
 from typing import Any
 from typing import Iterable
-from typing import Type
 
 import clevercsv
 
@@ -32,7 +31,7 @@ def _write_test(
             self.assertEqual(fp.read(), expect + writer.dialect.lineterminator)
 
     def _write_error_test(
-        self, exc: Type[Exception], fields: Any, **kwargs: Any
+        self, exc: type[Exception], fields: Any, **kwargs: Any
     ) -> None:
         with tempfile.TemporaryFile("w+", newline="", prefix="ccsv_") as fp:
             writer = clevercsv.writer(fp, **kwargs)