Merge pull request #190 from fonttools/structure-unstructure-default-…

…methods export structure/unstructure public methods using default_converter
fonttools · Dec 17, 2021 · e08a421 · e08a421
2 parents 66d3de0 + 7f01997
commit e08a421
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/ufoLib2/converters.py b/src/ufoLib2/converters.py
@@ -26,8 +26,9 @@ def get_origin(cl: Type[Any]) -> Any:
 
 
 __all__ = [
-    "default_converter",
     "register_hooks",
+    "structure",
+    "unstructure",
 ]
 
 
@@ -139,3 +140,6 @@ def structure_bytes(v: str, _: Any) -> bytes:
     prefer_attrib_converters=False,
 )
 register_hooks(default_converter, allow_bytes=False)
+
+structure = default_converter.structure
+unstructure = default_converter.unstructure
diff --git a/tests/test_converters.py b/tests/test_converters.py
@@ -49,7 +49,7 @@
 
 # isort: off
 cattr = pytest.importorskip("cattr")
-from ufoLib2.converters import default_converter, register_hooks  # noqa: E402
+from ufoLib2.converters import register_hooks, structure, unstructure  # noqa: E402
 
 
 @pytest.mark.parametrize(
@@ -499,17 +499,17 @@
     ],
 )
 def test_unstructure_structure(obj: Any, expected: dict[str, Any]) -> None:
-    assert default_converter.unstructure(obj) == expected
-    assert default_converter.structure(expected, type(obj)) == obj
+    assert unstructure(obj) == expected
+    assert structure(expected, type(obj)) == obj
 
 
 def test_unstructure_lazy_font(ufo_UbuTestData: Font) -> None:
     font1 = ufo_UbuTestData
     assert font1._lazy
 
-    font_data = default_converter.unstructure(font1)
+    font_data = unstructure(font1)
 
-    font2 = default_converter.structure(font_data, Font)
+    font2 = structure(font_data, Font)
     assert font2 == font1
 
     assert not font2._lazy
@@ -683,7 +683,7 @@ def test_json_dumps(datadir: pathlib.Path) -> None:
     # opening the UFO on Windows
     font.features.normalize_newlines()
 
-    data = default_converter.unstructure(font)
+    data = unstructure(font)
 
     expected = (datadir / "MutatorSansBoldCondensed.json").read_text()
 
@@ -698,4 +698,4 @@ def test_json_loads(datadir: pathlib.Path) -> None:
     # opening the UFO on Windows
     expected.features.normalize_newlines()
 
-    assert default_converter.structure(data, Font) == expected
+    assert structure(data, Font) == expected