From 176b5f763d5e6c3197fc3bac6d0e3793abb514ec Mon Sep 17 00:00:00 2001 From: Cosimo Lupo Date: Wed, 17 Oct 2018 17:41:43 +0100 Subject: [PATCH] change 'import ufoLib' to 'import fontTools.ufoLib' --- Lib/fontTools/misc/plistlib.py | 6 +++--- Lib/fontTools/ufoLib/__init__.py | 20 ++++++++++---------- Lib/fontTools/ufoLib/glifLib.py | 16 ++++++++-------- Lib/fontTools/ufoLib/validators.py | 2 +- Tests/pens/reverseContourPen_test.py | 7 ++----- Tests/ufoLib/testSupport.py | 2 +- Tests/ufoLib/test_GLIF1.py | 2 +- Tests/ufoLib/test_GLIF2.py | 2 +- Tests/ufoLib/test_UFO1.py | 4 ++-- Tests/ufoLib/test_UFO2.py | 4 ++-- Tests/ufoLib/test_UFO3.py | 6 +++--- Tests/ufoLib/test_UFOConversion.py | 4 ++-- Tests/ufoLib/test_UFOZ.py | 6 +++--- Tests/ufoLib/test_etree.py | 2 +- Tests/ufoLib/test_filenames.py | 2 +- Tests/ufoLib/test_glifLib.py | 2 +- Tests/ufoLib/test_plistlib.py | 4 ++-- 17 files changed, 44 insertions(+), 47 deletions(-) diff --git a/Lib/fontTools/misc/plistlib.py b/Lib/fontTools/misc/plistlib.py index a69a2e267..9d05f49a7 100644 --- a/Lib/fontTools/misc/plistlib.py +++ b/Lib/fontTools/misc/plistlib.py @@ -14,7 +14,7 @@ except ImportError: except ImportError: singledispatch = None -from ufoLib import etree +from fontTools.misc import etree from fontTools.misc.py23 import ( unicode, @@ -140,7 +140,7 @@ class PlistTarget(object): It is based on the CPython plistlib module's _PlistParser class, but does not use the expat parser. - >>> from ufoLib import etree + >>> from fontTools.misc import etree >>> parser = etree.XMLParser(target=PlistTarget()) >>> result = etree.XML( ... "" @@ -545,7 +545,7 @@ def dumps( # The following functions were part of the old py2-like ufoLib.plistlib API. # They are kept only for backward compatiblity. -from .utils import deprecated +from fontTools.ufoLib.utils import deprecated @deprecated("Use 'load' instead") diff --git a/Lib/fontTools/ufoLib/__init__.py b/Lib/fontTools/ufoLib/__init__.py index 4143b3dc1..d9f8451ac 100755 --- a/Lib/fontTools/ufoLib/__init__.py +++ b/Lib/fontTools/ufoLib/__init__.py @@ -15,12 +15,12 @@ import fs.zipfs import fs.tempfs import fs.tools from fontTools.misc.py23 import basestring, unicode, tounicode -from ufoLib import plistlib -from ufoLib.validators import * -from ufoLib.filenames import userNameToFileName -from ufoLib.converters import convertUFO1OrUFO2KerningToUFO3Kerning -from ufoLib.errors import UFOLibError -from ufoLib.utils import datetimeAsTimestamp, fsdecode, numberTypes +from fontTools.misc import plistlib +from fontTools.ufoLib.validators import * +from fontTools.ufoLib.filenames import userNameToFileName +from fontTools.ufoLib.converters import convertUFO1OrUFO2KerningToUFO3Kerning +from fontTools.ufoLib.errors import UFOLibError +from fontTools.ufoLib.utils import datetimeAsTimestamp, fsdecode, numberTypes """ A library for importing .ufo files and their descendants. @@ -632,7 +632,7 @@ class UFOReader(object): ``validateWrte`` will validate the written data, by default it is set to the class's validate value, can be overridden. """ - from ufoLib.glifLib import GlyphSet + from fontTools.ufoLib.glifLib import GlyphSet if validateRead is None: validateRead = self._validate @@ -1406,7 +1406,7 @@ class UFOWriter(object): raise AssertionError(self.formatVersion) def _getGlyphSetFormatVersion1(self, validateRead, validateWrite, glyphNameToFileNameFunc=None): - from ufoLib.glifLib import GlyphSet + from fontTools.ufoLib.glifLib import GlyphSet glyphSubFS = self.fs.makedir(DEFAULT_GLYPHS_DIRNAME, recreate=True), return GlyphSet( @@ -1418,7 +1418,7 @@ class UFOWriter(object): ) def _getGlyphSetFormatVersion2(self, validateRead, validateWrite, glyphNameToFileNameFunc=None): - from ufoLib.glifLib import GlyphSet + from fontTools.ufoLib.glifLib import GlyphSet glyphSubFS = self.fs.makedir(DEFAULT_GLYPHS_DIRNAME, recreate=True) return GlyphSet( @@ -1430,7 +1430,7 @@ class UFOWriter(object): ) def _getGlyphSetFormatVersion3(self, validateRead, validateWrite, layerName=None, defaultLayer=True, glyphNameToFileNameFunc=None): - from ufoLib.glifLib import GlyphSet + from fontTools.ufoLib.glifLib import GlyphSet # if the default flag is on, make sure that the default in the file # matches the default being written. also make sure that this layer diff --git a/Lib/fontTools/ufoLib/glifLib.py b/Lib/fontTools/ufoLib/glifLib.py index 9524141f4..db977a098 100755 --- a/Lib/fontTools/ufoLib/glifLib.py +++ b/Lib/fontTools/ufoLib/glifLib.py @@ -20,11 +20,11 @@ import fs.errors import fs.osfs import fs.path from fontTools.misc.py23 import basestring, unicode, tobytes, tounicode -from ufoLib import plistlib -from ufoLib.errors import GlifLibError -from ufoLib.pointPen import AbstractPointPen, PointToSegmentPen -from ufoLib.filenames import userNameToFileName -from ufoLib.validators import ( +from fontTools.misc import plistlib +from fontTools.ufoLib.errors import GlifLibError +from fontTools.ufoLib.pointPen import AbstractPointPen, PointToSegmentPen +from fontTools.ufoLib.filenames import userNameToFileName +from fontTools.ufoLib.validators import ( genericTypeValidator, colorValidator, guidelinesValidator, @@ -33,8 +33,8 @@ from ufoLib.validators import ( imageValidator, glyphLibValidator, ) -from ufoLib import etree -from ufoLib.utils import integerTypes, numberTypes +from fontTools.misc import etree +from fontTools.ufoLib.utils import integerTypes, numberTypes __all__ = [ @@ -170,7 +170,7 @@ class GlyphSet(object): self.rebuildContents() # here we reuse the same methods from UFOReader/UFOWriter - from ufoLib import _getPlist, _writePlist, _getFileModificationTime + from fontTools.ufoLib import _getPlist, _writePlist, _getFileModificationTime def rebuildContents(self, validateRead=None): """ diff --git a/Lib/fontTools/ufoLib/validators.py b/Lib/fontTools/ufoLib/validators.py index 8b6b028ee..cb44f8336 100644 --- a/Lib/fontTools/ufoLib/validators.py +++ b/Lib/fontTools/ufoLib/validators.py @@ -12,7 +12,7 @@ except ImportError: from collections import Mapping from fontTools.misc.py23 import basestring -from ufoLib.utils import integerTypes, numberTypes +from fontTools.ufoLib.utils import integerTypes, numberTypes # ------- diff --git a/Tests/pens/reverseContourPen_test.py b/Tests/pens/reverseContourPen_test.py index bace80688..6dbc5e00d 100644 --- a/Tests/pens/reverseContourPen_test.py +++ b/Tests/pens/reverseContourPen_test.py @@ -293,11 +293,8 @@ def test_reverse_pen(contour, expected): @pytest.mark.parametrize("contour, expected", TEST_DATA) def test_reverse_point_pen(contour, expected): - try: - from ufoLib.pointPen import ( - ReverseContourPointPen, PointToSegmentPen, SegmentToPointPen) - except ImportError: - pytest.skip("ufoLib not installed") + from fontTools.ufoLib.pointPen import ( + ReverseContourPointPen, PointToSegmentPen, SegmentToPointPen) recpen = RecordingPen() pt2seg = PointToSegmentPen(recpen, outputImpliedClosingLine=True) diff --git a/Tests/ufoLib/testSupport.py b/Tests/ufoLib/testSupport.py index 107fe3c47..2982ce84c 100755 --- a/Tests/ufoLib/testSupport.py +++ b/Tests/ufoLib/testSupport.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals import os -from ufoLib.utils import numberTypes +from fontTools.ufoLib.utils import numberTypes try: basestring diff --git a/Tests/ufoLib/test_GLIF1.py b/Tests/ufoLib/test_GLIF1.py index b4371c902..707c2097b 100644 --- a/Tests/ufoLib/test_GLIF1.py +++ b/Tests/ufoLib/test_GLIF1.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, unicode_literals import unittest -from ufoLib.glifLib import GlifLibError, readGlyphFromString, writeGlyphToString +from fontTools.ufoLib.glifLib import GlifLibError, readGlyphFromString, writeGlyphToString from .testSupport import Glyph, stripText from itertools import islice diff --git a/Tests/ufoLib/test_GLIF2.py b/Tests/ufoLib/test_GLIF2.py index 3db4931dd..2daa45335 100644 --- a/Tests/ufoLib/test_GLIF2.py +++ b/Tests/ufoLib/test_GLIF2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, unicode_literals import unittest -from ufoLib.glifLib import GlifLibError, readGlyphFromString, writeGlyphToString +from fontTools.ufoLib.glifLib import GlifLibError, readGlyphFromString, writeGlyphToString from .testSupport import Glyph, stripText from itertools import islice diff --git a/Tests/ufoLib/test_UFO1.py b/Tests/ufoLib/test_UFO1.py index 2fb688c65..6194270db 100644 --- a/Tests/ufoLib/test_UFO1.py +++ b/Tests/ufoLib/test_UFO1.py @@ -5,8 +5,8 @@ import shutil import unittest import tempfile from io import open -from ufoLib import UFOReader, UFOWriter, UFOLibError -from ufoLib import plistlib +from fontTools.ufoLib import UFOReader, UFOWriter, UFOLibError +from fontTools.ufoLib import plistlib from .testSupport import fontInfoVersion1, fontInfoVersion2 diff --git a/Tests/ufoLib/test_UFO2.py b/Tests/ufoLib/test_UFO2.py index c44d657fe..04309ba7e 100644 --- a/Tests/ufoLib/test_UFO2.py +++ b/Tests/ufoLib/test_UFO2.py @@ -5,8 +5,8 @@ import shutil import unittest import tempfile from io import open -from ufoLib import UFOReader, UFOWriter, UFOLibError -from ufoLib import plistlib +from fontTools.ufoLib import UFOReader, UFOWriter, UFOLibError +from fontTools.ufoLib import plistlib from .testSupport import fontInfoVersion2 diff --git a/Tests/ufoLib/test_UFO3.py b/Tests/ufoLib/test_UFO3.py index f59b136bf..3cfd7c8f8 100644 --- a/Tests/ufoLib/test_UFO3.py +++ b/Tests/ufoLib/test_UFO3.py @@ -6,9 +6,9 @@ import unittest import tempfile from io import open from fontTools.misc.py23 import unicode -from ufoLib import UFOReader, UFOWriter, UFOLibError -from ufoLib.glifLib import GlifLibError -from ufoLib import plistlib +from fontTools.ufoLib import UFOReader, UFOWriter, UFOLibError +from fontTools.ufoLib.glifLib import GlifLibError +from fontTools.misc import plistlib from .testSupport import fontInfoVersion3 diff --git a/Tests/ufoLib/test_UFOConversion.py b/Tests/ufoLib/test_UFOConversion.py index 834237335..2e288b94d 100644 --- a/Tests/ufoLib/test_UFOConversion.py +++ b/Tests/ufoLib/test_UFOConversion.py @@ -5,8 +5,8 @@ import shutil import unittest import tempfile from io import open -from ufoLib import UFOReader, UFOWriter -from ufoLib import plistlib +from fontTools.ufoLib import UFOReader, UFOWriter +from fontTools.ufoLib import plistlib from .testSupport import expectedFontInfo1To2Conversion, expectedFontInfo2To1Conversion diff --git a/Tests/ufoLib/test_UFOZ.py b/Tests/ufoLib/test_UFOZ.py index d009e5331..b32bba386 100644 --- a/Tests/ufoLib/test_UFOZ.py +++ b/Tests/ufoLib/test_UFOZ.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import, unicode_literals from fontTools.misc.py23 import tostr -from ufoLib import UFOReader, UFOWriter, UFOFileStructure -from ufoLib.errors import UFOLibError, GlifLibError -from ufoLib import plistlib +from fontTools.ufoLib import UFOReader, UFOWriter, UFOFileStructure +from fontTools.ufoLib.errors import UFOLibError, GlifLibError +from fontTools.misc import plistlib import sys import os import fs.osfs diff --git a/Tests/ufoLib/test_etree.py b/Tests/ufoLib/test_etree.py index 098eca130..d2f585cf5 100644 --- a/Tests/ufoLib/test_etree.py +++ b/Tests/ufoLib/test_etree.py @@ -1,6 +1,6 @@ # coding: utf-8 from __future__ import absolute_import, unicode_literals -from ufoLib import etree +from fontTools.misc import etree from collections import OrderedDict import io import pytest diff --git a/Tests/ufoLib/test_filenames.py b/Tests/ufoLib/test_filenames.py index dcf3ad55b..a1d6d92a9 100644 --- a/Tests/ufoLib/test_filenames.py +++ b/Tests/ufoLib/test_filenames.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals import unittest -from ufoLib.filenames import userNameToFileName, handleClash1, handleClash2 +from fontTools.ufoLib.filenames import userNameToFileName, handleClash1, handleClash2 class TestFilenames(unittest.TestCase): diff --git a/Tests/ufoLib/test_glifLib.py b/Tests/ufoLib/test_glifLib.py index 312053496..43b350662 100644 --- a/Tests/ufoLib/test_glifLib.py +++ b/Tests/ufoLib/test_glifLib.py @@ -5,7 +5,7 @@ import shutil import unittest from io import open from .testSupport import getDemoFontGlyphSetPath -from ufoLib.glifLib import ( +from fontTools.ufoLib.glifLib import ( GlyphSet, glyphNameToFileName, readGlyphFromString, writeGlyphToString, _XML_DECLARATION, ) diff --git a/Tests/ufoLib/test_plistlib.py b/Tests/ufoLib/test_plistlib.py index a462f37d6..e917410e4 100644 --- a/Tests/ufoLib/test_plistlib.py +++ b/Tests/ufoLib/test_plistlib.py @@ -7,8 +7,8 @@ import collections from io import BytesIO from numbers import Integral from fontTools.misc.py23 import tounicode, unicode -from ufoLib import etree -from ufoLib import plistlib +from fontTools.misc import etree +from fontTools.misc import plistlib import pytest