shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[subset/merge] Fix namespace clash

Browse Source 
Fixes https://github.com/fonttools/fonttools/issues/1955
This commit is contained in:
Behdad Esfahbod 2020-06-02 15:13:06 -07:00
parent 7a723b7344
commit 26ac716a8d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/fontTools/merge.py
View File

@ -742,12 +742,12 @@ def __merge_classify_context(self):
if self.Format not in [1, 2, 3]: if self.Format not in [1, 2, 3]:
return None # Don't shoot the messenger; let it go return None # Don't shoot the messenger; let it go
if not hasattr(self.__class__, "__ContextHelpers"): if not hasattr(self.__class__, "_merge__ContextHelpers"):
self.__class__.__ContextHelpers = {} self.__class__._merge__ContextHelpers = {}
if self.Format not in self.__class__.__ContextHelpers: if self.Format not in self.__class__._merge__ContextHelpers:
helper = ContextHelper(self.__class__, self.Format) helper = ContextHelper(self.__class__, self.Format)
self.__class__.__ContextHelpers[self.Format] = helper self.__class__._merge__ContextHelpers[self.Format] = helper
return self.__class__.__ContextHelpers[self.Format] return self.__class__._merge__ContextHelpers[self.Format]
@_add_method(otTables.ContextSubst, @_add_method(otTables.ContextSubst,

10
Lib/fontTools/subset/__init__.py
View File

@ -899,12 +899,12 @@ def __subset_classify_context(self):
if self.Format not in [1, 2, 3]: if self.Format not in [1, 2, 3]:
return None # Don't shoot the messenger; let it go return None # Don't shoot the messenger; let it go
if not hasattr(self.__class__, "__ContextHelpers"): if not hasattr(self.__class__, "_subset__ContextHelpers"):
self.__class__.__ContextHelpers = {} self.__class__._subset__ContextHelpers = {}
if self.Format not in self.__class__.__ContextHelpers: if self.Format not in self.__class__._subset__ContextHelpers:
helper = ContextHelper(self.__class__, self.Format) helper = ContextHelper(self.__class__, self.Format)
self.__class__.__ContextHelpers[self.Format] = helper self.__class__._subset__ContextHelpers[self.Format] = helper
return self.__class__.__ContextHelpers[self.Format] return self.__class__._subset__ContextHelpers[self.Format]
@_add_method(otTables.ContextSubst, @_add_method(otTables.ContextSubst,
otTables.ChainContextSubst) otTables.ChainContextSubst)