Merge pull request #6 from fonttools/use-fontools-ufoLib

Use fontTools.ufoLib

requirements.txt

@@ -1,5 +1,2 @@
-fonttools==3.26.0
-attrs==18.1.0
-lxml==4.2.1
-typing==3.6.4 ; python_version<'3.5'
-singledispatch ; python_version<'3.4'
+fonttools==3.31.0
+attrs==18.2.0

setup.py

@@ -22,11 +22,9 @@
     include_package_data=True,
     python_requires=">=2.7",
     install_requires=[
-        "fonttools>=3.24.0",
-        "attrs>=17.3.0",
-        "lxml",
+        "fonttools[ufo,lxml] >= 3.31.0",
+        "attrs>=18.2.0",
         "typing ; python_version<'3.5'",
-        "singledispatch ; python_version<'3.4'",
     ],
     setup_requires=["setuptools_scm"],
     classifiers=[

src/ufoLib2/__init__.py

@@ -1,16 +1,11 @@
 """ufoLib2 -- a package for dealing with UFO fonts."""
 
-# The structure of UFO font files is defined here:
-# http://unifiedfontobject.org/
-
 from ufoLib2.objects import Font
-from ufoLib2.reader import UFOReader
-from ufoLib2.writer import UFOWriter
 
 try:
     from ._version import version as __version__
 except ImportError:
     __version__ = "0.0.0+unknown"
 
 
-__all__ = ["Font", "UFOReader", "UFOWriter"]
+__all__ = ["Font"]

src/ufoLib2/objects/component.py

@@ -1,7 +1,7 @@
 import attr
 from typing import Optional
 from ufoLib2.objects.misc import Transformation
-from ufoLib2.pointPens.converterPens import PointToSegmentPen
+from fontTools.pens.pointPen import PointToSegmentPen
 import warnings
 
 

src/ufoLib2/objects/contour.py

@@ -1,6 +1,6 @@
 import attr
 from typing import Optional
-from ufoLib2.pointPens.converterPens import PointToSegmentPen
+from fontTools.pens.pointPen import PointToSegmentPen
 import warnings
 
 

src/ufoLib2/objects/dataSet.py

@@ -1,9 +1,10 @@
 from ufoLib2.objects.misc import DataStore
-from ufoLib2.reader import UFOReader
-from ufoLib2.writer import UFOWriter
+from fontTools.ufoLib import UFOReader
+from fontTools.ufoLib import UFOWriter
 
 
 class DataSet(DataStore):
+    listdir = UFOReader.getDataDirectoryListing
     readf = UFOReader.readData
     writef = UFOWriter.writeData
-    deletef = UFOWriter.deleteData
+    deletef = UFOWriter.removeData