[merge] Remove BaseTable.__hash__ need
diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py
index b86bbd3..c0a5ace 100644
--- a/Lib/fontTools/merge.py
+++ b/Lib/fontTools/merge.py
@@ -556,11 +556,11 @@
if not t: continue
if t.table.LookupList and t.table.FeatureList:
- lookupMap = dict(enumerate(t.table.LookupList.Lookup))
+ lookupMap = {i:id(v) for i,v in enumerate(t.table.LookupList.Lookup)}
t.table.FeatureList.mapLookups(lookupMap)
if t.table.FeatureList and t.table.ScriptList:
- featureMap = dict(enumerate(t.table.FeatureList.FeatureRecord))
+ featureMap = {i:id(v) for i,v in enumerate(t.table.FeatureList.FeatureRecord)}
t.table.ScriptList.mapFeatures(featureMap)
# TODO GDEF/Lookup MarkFilteringSets
@@ -576,11 +576,11 @@
if not t: continue
if t.table.LookupList and t.table.FeatureList:
- lookupMap = dict((v,i) for i,v in enumerate(t.table.LookupList.Lookup))
+ lookupMap = {id(v):i for i,v in enumerate(t.table.LookupList.Lookup)}
t.table.FeatureList.mapLookups(lookupMap)
if t.table.FeatureList and t.table.ScriptList:
- featureMap = dict((v,i) for i,v in enumerate(t.table.FeatureList.FeatureRecord))
+ featureMap = {id(v):i for i,v in enumerate(t.table.FeatureList.FeatureRecord)}
t.table.ScriptList.mapFeatures(featureMap)
# TODO GDEF/Lookup MarkFilteringSets
diff --git a/Lib/fontTools/ttLib/tables/otBase.py b/Lib/fontTools/ttLib/tables/otBase.py
index ad1eb56..cac10f5 100644
--- a/Lib/fontTools/ttLib/tables/otBase.py
+++ b/Lib/fontTools/ttLib/tables/otBase.py
@@ -496,9 +496,6 @@
class BaseTable(object):
- def __hash__(self):
- return id(self)
-
def __getattr__(self, attr):
reader = self.__dict__.get("reader")
if reader: