Merge branch 'master' into develop

* master:
  Fix handling of custom types with future annotations enabled

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 - Added an `INDENT_YAML_BLOCKS` setting to optionally use the old serialization behavior.
 
+# 0.4.2 (2019-09-27)
+
+- Fixed a `TypeError` when converting custom types with `from __future__ import annotations` enabled.
+
 # 0.4.1 (2019-08-25)
 
 - Fixed a `TypeError` when converting non-builtin attributes.

Makefile

@@ -41,7 +41,7 @@ DEPENDENCIES := $(VIRTUAL_ENV)/.poetry-$(shell bin/checksum pyproject.toml poetr
 install: $(DEPENDENCIES) .cache
 
 $(DEPENDENCIES): poetry.lock
-	@ poetry config settings.virtualenvs.in-project true
+	@ poetry config virtualenvs.in-project true || poetry config settings.virtualenvs.in-project true
 	poetry install
 	@ touch $@
 

datafiles/converters/__init__.py

@@ -14,9 +14,10 @@
 _REGISTRY: Dict[Union[type, str], type] = {}
 
 
-def register(cls: type, converter: type):
+def register(cls: Union[type, str], converter: type):
     _REGISTRY[cls] = converter
-    _REGISTRY[cls.__name__] = converter
+    if not isinstance(cls, str):
+        _REGISTRY[cls.__name__] = converter
 
 
 register(Integer.TYPE, Integer)
@@ -82,6 +83,14 @@ def map_type(cls, *, name: str = '', item_cls: Optional[type] = None):
 
         raise TypeError(f'Unsupported container type: {cls.__origin__}')
 
+    if isinstance(cls, str):
+        log.debug(f'Searching for class matching {cls!r} annotation')
+        for cls2 in Converter.__subclasses__():
+            if cls2.__name__ == cls:
+                register(cls, cls2)
+                log.debug(f'Registered {cls2} as new converter')
+                return cls2
+
     if not isclass(cls):
         raise TypeError(f'Annotation is not a type: {cls!r}')
 

datafiles/utils.py

@@ -24,10 +24,10 @@ def dictify(value: Any) -> Dict:
         return {k: dictify(v) for k, v in value.items()}
 
     if isinstance(value, str):
-        return value
+        return value  # type: ignore
 
     with suppress(TypeError):
-        return [dictify(x) for x in value]
+        return [dictify(x) for x in value]  # type: ignore
 
     return value