Merge branch 'master' into prop-init-handling

Author: dfurtado

AUTHORS.md

@@ -7,3 +7,4 @@
 ## Contributors
 
 * Nick Schober
+* Zoltan Ivanfi

dataclass_csv/dataclass_reader.py

@@ -3,6 +3,7 @@
 
 from datetime import datetime
 from distutils.util import strtobool
+from typing import Union
 
 from .field_mapper import FieldMapper
 from .exceptions import CsvValueError
@@ -149,7 +150,22 @@ def _process_row(self, row):
                 values.append(None)
                 continue
 
-            if field.type is datetime:
+            field_type = field.type
+            # Special handling for Optional (Union of a single real type and None)
+            if (
+                # The first part of the condition is for Python < 3.8
+                type(field_type).__name__ == '_Union'
+                # The second part of the condition is for Python >= 3.8
+                or '__origin__' in field_type.__dict__
+                and field_type.__origin__ is Union
+            ):
+                real_types = [
+                    t for t in field_type.__args__ if t is not type(None)
+                ]
+                if len(real_types) == 1:
+                    field_type = real_types[0]
+
+            if field_type is datetime:
                 try:
                     transformed_value = self._parse_date_value(field, value)
                 except ValueError as ex:
@@ -160,7 +176,7 @@ def _process_row(self, row):
                     values.append(transformed_value)
                     continue
 
-            if field.type is bool:
+            if field_type is bool:
                 try:
                     transformed_value = (
                         value
@@ -176,7 +192,7 @@ def _process_row(self, row):
                     continue
 
             try:
-                transformed_value = field.type(value)
+                transformed_value = field_type(value)
             except ValueError:
                 raise CsvValueError(
                     (

tests/mocks.py

@@ -4,6 +4,8 @@
 
 from dataclass_csv import dateformat, accept_whitespaces
 
+from typing import Optional
+
 
 @dataclasses.dataclass
 class User:
@@ -79,3 +81,9 @@ class UserWithInitFalseAndDefaultValue:
     firstname: str
     lastname: str
     age: int = dataclasses.field(init=False, default=0)
+
+@dataclasses.dataclass
+class UserWithOptionalAge:
+    name: str
+    age: Optional[int]
+

tests/test_dataclass_reader.py

@@ -5,6 +5,7 @@
 
 from .mocks import (
     User,
+    UserWithOptionalAge,
     DataclassWithBooleanValue,
     DataclassWithBooleanValueNoneDefault,
     UserWithInitFalse,
@@ -158,3 +159,11 @@ def test_try_to_access_not_initialized_prop_with_default_value(create_csv):
         items = list(reader)
         user = items[0]
         assert user.age == 0
+
+
+def test_reader_with_optional_types(create_csv):
+    csv_file = create_csv({'name': 'User', 'age': 40})
+
+    with csv_file.open() as f:
+        reader = DataclassReader(f, UserWithOptionalAge)
+        list(reader)