From 26ac716a8d85c832cba2694dda994c03aafe3386 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 2 Jun 2020 15:13:06 -0700 Subject: [PATCH] [subset/merge] Fix namespace clash Fixes https://github.com/fonttools/fonttools/issues/1955 --- Lib/fontTools/merge.py | 10 +++++----- Lib/fontTools/subset/__init__.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Lib/fontTools/merge.py b/Lib/fontTools/merge.py index 890234df9..96b80236c 100644 --- a/Lib/fontTools/merge.py +++ b/Lib/fontTools/merge.py @@ -742,12 +742,12 @@ def __merge_classify_context(self): if self.Format not in [1, 2, 3]: return None # Don't shoot the messenger; let it go - if not hasattr(self.__class__, "__ContextHelpers"): - self.__class__.__ContextHelpers = {} - if self.Format not in self.__class__.__ContextHelpers: + if not hasattr(self.__class__, "_merge__ContextHelpers"): + self.__class__._merge__ContextHelpers = {} + if self.Format not in self.__class__._merge__ContextHelpers: helper = ContextHelper(self.__class__, self.Format) - self.__class__.__ContextHelpers[self.Format] = helper - return self.__class__.__ContextHelpers[self.Format] + self.__class__._merge__ContextHelpers[self.Format] = helper + return self.__class__._merge__ContextHelpers[self.Format] @_add_method(otTables.ContextSubst, diff --git a/Lib/fontTools/subset/__init__.py b/Lib/fontTools/subset/__init__.py index 7f8aba87f..88636be8b 100644 --- a/Lib/fontTools/subset/__init__.py +++ b/Lib/fontTools/subset/__init__.py @@ -899,12 +899,12 @@ def __subset_classify_context(self): if self.Format not in [1, 2, 3]: return None # Don't shoot the messenger; let it go - if not hasattr(self.__class__, "__ContextHelpers"): - self.__class__.__ContextHelpers = {} - if self.Format not in self.__class__.__ContextHelpers: + if not hasattr(self.__class__, "_subset__ContextHelpers"): + self.__class__._subset__ContextHelpers = {} + if self.Format not in self.__class__._subset__ContextHelpers: helper = ContextHelper(self.__class__, self.Format) - self.__class__.__ContextHelpers[self.Format] = helper - return self.__class__.__ContextHelpers[self.Format] + self.__class__._subset__ContextHelpers[self.Format] = helper + return self.__class__._subset__ContextHelpers[self.Format] @_add_method(otTables.ContextSubst, otTables.ChainContextSubst)