Remove unused code

Author: Jace Browning

datafiles/converters/__init__.py

@@ -57,9 +57,8 @@ def map_type(cls, *, name: str = '', item_cls: Optional[type] = None):
             try:
                 converter = map_type(item_cls or cls.__args__[0])
             except TypeError as e:
-                if '~T' in str(e):
-                    e = TypeError(f"Type is required with 'List' annotation")
-                raise e from None
+                assert '~T' in str(e), f'Unhandled error: ' + str(e)
+                raise TypeError("Type is required with 'List' annotation") from None
             else:
                 converter = List.subclass(converter)
 

datafiles/formats.py

@@ -7,8 +7,6 @@
 from pathlib import Path
 from typing import IO, Any, Dict, List
 
-import log
-
 from . import settings, types
 
 
@@ -86,11 +84,7 @@ def extensions(cls):
     def deserialize(cls, file_object):
         from ruamel import yaml
 
-        try:
-            return yaml.round_trip_load(file_object, preserve_quotes=True) or {}
-        except NotImplementedError as e:
-            log.error(str(e))
-            return {}
+        return yaml.round_trip_load(file_object, preserve_quotes=True) or {}
 
     @classmethod
     def serialize(cls, data):
@@ -151,19 +145,21 @@ def increase_indent(self, flow=False, indentless=False):
         return text
 
 
-def deserialize(path: Path, extension: str) -> Dict:
-    formatter = _get_formatter(extension)
+def deserialize(path: Path, extension: str, *, formatter=None) -> Dict:
+    if formatter is None:
+        formatter = _get_formatter(extension)
     with path.open('r') as file_object:
         return formatter.deserialize(file_object)
 
 
-def serialize(data: Dict, extension: str = '.yml') -> str:
-    formatter = _get_formatter(extension)
+def serialize(data: Dict, extension: str = '.yml', *, formatter=None) -> str:
+    if formatter is None:
+        formatter = _get_formatter(extension)
     return formatter.serialize(data)
 
 
 def _get_formatter(extension: str):
-    if settings.YAML_LIBRARY == 'PyYAML':
+    if settings.YAML_LIBRARY == 'PyYAML':  # pragma: no cover
         register('.yml', PyYAML)
 
     with suppress(KeyError):

datafiles/tests/test_formats.py

@@ -13,7 +13,7 @@ def data():
 
     def describe_ruamel_yaml():
         def it_indents_blocks_by_default(expect, data):
-            text = formats.RuamelYAML.serialize(data)
+            text = formats.serialize(data, '.yaml')
             expect(text) == dedent(
                 """
             key: value
@@ -26,7 +26,7 @@ def it_indents_blocks_by_default(expect, data):
 
         def it_can_render_lists_inline(expect, data, monkeypatch):
             monkeypatch.setattr(settings, 'INDENT_YAML_BLOCKS', False)
-            text = formats.RuamelYAML.serialize(data)
+            text = formats.serialize(data, '.yaml')
             expect(text) == dedent(
                 """
             key: value
@@ -39,7 +39,7 @@ def it_can_render_lists_inline(expect, data, monkeypatch):
 
     def describe_pyyaml():
         def it_indents_blocks_by_default(expect, data):
-            text = formats.PyYAML.serialize(data)
+            text = formats.serialize(data, '.yaml', formatter=formats.PyYAML)
             expect(text) == dedent(
                 """
             key: value
@@ -52,7 +52,7 @@ def it_indents_blocks_by_default(expect, data):
 
         def it_can_render_lists_inline(expect, data, monkeypatch):
             monkeypatch.setattr(settings, 'INDENT_YAML_BLOCKS', False)
-            text = formats.PyYAML.serialize(data)
+            text = formats.serialize(data, '.yaml', formatter=formats.PyYAML)
             expect(text) == dedent(
                 """
             key: value
@@ -71,18 +71,26 @@ def path(tmp_path):
         path.write_text("")
         return path
 
-    def with_empty_yaml_file(expect, path):
-        data = formats.deserialize(path, '.yaml')
-        expect(data) == {}
+    def describe_ruamel_yaml():
+        def with_empty_file(expect, path):
+            data = formats.deserialize(path, '.yaml')
+            expect(data) == {}
+
+    def describe_pyyaml():
+        def with_empty_file(expect, path):
+            data = formats.deserialize(path, '.yaml', formatter=formats.PyYAML)
+            expect(data) == {}
 
-    def with_empty_json_file(expect, path):
-        path.write_text("{}")
-        data = formats.deserialize(path, '.json')
-        expect(data) == {}
+    def describe_json():
+        def with_empty_file(expect, path):
+            path.write_text("{}")
+            data = formats.deserialize(path, '.json')
+            expect(data) == {}
 
-    def with_empty_toml_file(expect, path):
-        data = formats.deserialize(path, '.toml')
-        expect(data) == {}
+    def describe_toml():
+        def with_empty_file(expect, path):
+            data = formats.deserialize(path, '.toml')
+            expect(data) == {}
 
     def with_unknown_extension(expect, path):
         with expect.raises(ValueError):

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "datafiles"
-version = "0.9b3"
+version = "0.9b4"
 description = "File-based ORM for dataclasses."
 
 license = "MIT"