diff options
| author | Elliott Hughes <enh@google.com> | 2021-04-02 20:28:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 20:28:56 +0000 |
| commit | ec41266cf300d743bba015596b3b590b16965a76 (patch) | |
| tree | 8e925d800e27f7a70c2b6a131b14526bc0f095b5 /Lib/fontTools/fontBuilder.py | |
| parent | 168af316a5157bd04ddb5cee63bbb924c3717ee7 (diff) | |
| parent | c1d5ba5438b639565b0c35ab2cd58555d0fa7645 (diff) | |
| download | fonttools-ec41266cf300d743bba015596b3b590b16965a76.tar.gz | |
Upgrade fonttools to 4.22.0 am: 6cf80b8fa7 am: d11d71b940 am: 78e33b8121 am: c1d5ba5438android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/external/fonttools/+/1662591
Change-Id: Ib4247da3169cfa03c9927a0fad300dcbd5875818
Diffstat (limited to 'Lib/fontTools/fontBuilder.py')
| -rw-r--r-- | Lib/fontTools/fontBuilder.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Lib/fontTools/fontBuilder.py b/Lib/fontTools/fontBuilder.py index f4c943f3..e2824084 100644 --- a/Lib/fontTools/fontBuilder.py +++ b/Lib/fontTools/fontBuilder.py @@ -129,10 +129,8 @@ fb.save("test.otf") ``` """ -from .misc.py23 import * from .ttLib import TTFont, newTable from .ttLib.tables._c_m_a_p import cmap_classes -from .ttLib.tables._n_a_m_e import NameRecord, makeName from .misc.timeTools import timestampNow import struct from collections import OrderedDict @@ -478,7 +476,7 @@ class FontBuilder(object): nameID = nameName else: nameID = _nameIDs[nameName] - if isinstance(nameValue, basestring): + if isinstance(nameValue, str): nameValue = dict(en=nameValue) nameTable.addMultilingualName( nameValue, ttFont=self.font, nameID=nameID, windows=windows, mac=mac @@ -894,7 +892,6 @@ def buildCmapSubTable(cmapping, format, platformID, platEncID): def addFvar(font, axes, instances): from .ttLib.tables._f_v_a_r import Axis, NamedInstance - from .designspaceLib import AxisDescriptor assert axes |