From 28aeabb08b2656cb240063865c37f192532badf5 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 27 Nov 2013 04:07:28 -0500 Subject: [PATCH] 2to3 --fix=filter --- Lib/fontTools/ttLib/tables/E_B_L_C_.py | 2 +- Lib/fontTools/ttLib/tables/_c_m_a_p.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/fontTools/ttLib/tables/E_B_L_C_.py b/Lib/fontTools/ttLib/tables/E_B_L_C_.py index 0c6fcaf1b..03eced906 100644 --- a/Lib/fontTools/ttLib/tables/E_B_L_C_.py +++ b/Lib/fontTools/ttLib/tables/E_B_L_C_.py @@ -412,7 +412,7 @@ class EblcIndexSubTable: (name, (startByte, endByte)) = args return startByte < endByte # Remove all skip glyphs. - dataPairs = filter(isValidLocation, zip(self.names, self.locations)) + dataPairs = list(filter(isValidLocation, zip(self.names, self.locations))) self.names, self.locations = map(list, zip(*dataPairs)) # A closure for creating a custom mixin. This is done because formats 1 and 3 diff --git a/Lib/fontTools/ttLib/tables/_c_m_a_p.py b/Lib/fontTools/ttLib/tables/_c_m_a_p.py index 3b2559391..257517f32 100644 --- a/Lib/fontTools/ttLib/tables/_c_m_a_p.py +++ b/Lib/fontTools/ttLib/tables/_c_m_a_p.py @@ -1220,7 +1220,7 @@ class cmap_format_14(CmapSubtable): for uvs in uvsList: entryList = uvsDict[uvs] - defList = filter(lambda entry: entry[1] == None, entryList) + defList = [entry for entry in entryList if entry[1] == None] if defList: defList = map(lambda entry: entry[0], defList) defOVSOffset = offset @@ -1247,7 +1247,7 @@ class cmap_format_14(CmapSubtable): else: defOVSOffset = 0 - ndefList = filter(lambda entry: entry[1] != None, entryList) + ndefList = [entry for entry in entryList if entry[1] != None] if ndefList: nonDefUVSOffset = offset ndefList.sort()