rename cls to klass to avoid name collusion with the real cls arg used in classmethods

Author: kraktus

dataclass_csv/dataclass_reader.py

@@ -66,7 +66,7 @@ class DataclassReader(Generic[T]):
     def __init__(
         self,
         f: Any,
-        cls: Type[T],
+        klass: Type[T],
         fieldnames: Optional[Sequence[str]] = None,
         restkey: Optional[str] = None,
         restval: Optional[Any] = None,
@@ -78,10 +78,10 @@ def __init__(
         if not f:
             raise ValueError("The f argument is required.")
 
-        if cls is None or not dataclasses.is_dataclass(cls):
-            raise ValueError("cls argument needs to be a dataclass.")
+        if klass is None or not dataclasses.is_dataclass(klass):
+            raise ValueError("klass argument needs to be a dataclass.")
 
-        self._cls = cls
+        self._cls = klass
         self._optional_fields = self._get_optional_fields()
         self._field_mapping: Dict[str, Dict[str, Any]] = {}
 
@@ -94,7 +94,7 @@ def __init__(
         if validate_header:
             _verify_duplicate_header_items(self._reader.fieldnames)
 
-        self.type_hints = typing.get_type_hints(cls)
+        self.type_hints = typing.get_type_hints(klass)
 
     def _get_optional_fields(self):
         return [

dataclass_csv/dataclass_writer.py

@@ -9,7 +9,7 @@ def __init__(
         self,
         f: Any,
         data: List[Any],
-        cls: Type[object],
+        klass: Type[object],
         dialect: str = "excel",
         **fmtparams: Any,
     ):
@@ -19,14 +19,14 @@ def __init__(
         if not isinstance(data, list):
             raise ValueError("Invalid 'data' argument. It must be a list")
 
-        if not dataclasses.is_dataclass(cls):
-            raise ValueError("Invalid 'cls' argument. It must be a dataclass")
+        if not dataclasses.is_dataclass(klass):
+            raise ValueError("Invalid 'klass' argument. It must be a dataclass")
 
         self._data = data
-        self._cls = cls
+        self._cls = klass
         self._field_mapping: Dict[str, str] = dict()
 
-        self._fieldnames = [x.name for x in dataclasses.fields(cls)]
+        self._fieldnames = [x.name for x in dataclasses.fields(klass)]
 
         self._writer = csv.writer(f, dialect=dialect, **fmtparams)
 

dataclass_csv/decorators.py

@@ -23,9 +23,9 @@ def dateformat(date_format: str) -> Callable[[F], F]:
     if not date_format or not isinstance(date_format, str):
         raise ValueError("Invalid value for the date_format argument")
 
-    def func(cls):
-        cls.__dateformat__ = date_format
-        return cls
+    def func(klass):
+        klass.__dateformat__ = date_format
+        return klass
 
     return func
 
@@ -47,9 +47,9 @@ def accept_whitespaces(_cls: Type[Any] = None) -> Callable[[F], F]:
         >>>     brithday: datetime
     """
 
-    def func(cls):
-        cls.__accept_whitespaces__ = True
-        return cls
+    def func(klass):
+        klass.__accept_whitespaces__ = True
+        return klass
 
     if _cls:
         return func(_cls)