fixup! Only initialize the method dispatcher once

gsnedders · gsnedders · commit a4b52347d418 · 2020-05-24T04:11:49.000+01:00
diff --git a/html5lib/_tokenizer.py b/html5lib/_tokenizer.py
@@ -36,7 +36,7 @@ class HTMLTokenizer(object):
     * self.stream
       Points to HTMLInputStream object.
     """
-    
+
     def __init__(self, stream, parser=None, **kwargs):
 
         self.stream = HTMLInputStream(stream, **kwargs)
diff --git a/html5lib/_utils.py b/html5lib/_utils.py
@@ -69,25 +69,17 @@ def __init__(self, items=()):
     def __getitem__(self, key):
         return dict.get(self, key, self.default)
 
+    def __get__(self, instance, owner=None):
+        return BoundMethodDispatcher(instance, self)
+
 
 class BoundMethodDispatcher(Mapping):
     def __init__(self, instance, dispatcher):
         self.instance = instance
         self.dispatcher = dispatcher
-        self.cache = {}
 
     def __getitem__(self, key):
-        if key in self.cache:
-            return self.cache[key]
-
-        try:
-            item = self.dispatcher[key]
-        except KeyError:
-            item = self.default
-
-        r = item.__get__(self.instance)
-        self.cache[key] = r
-        return r
+        return self.dispatcher[key].__get__(self.instance)
 
     def get(self, key, default):
         if key in self.dispatcher:
diff --git a/html5lib/html5parser.py b/html5lib/html5parser.py
@@ -456,7 +456,7 @@ def processStartTag(self, token):
             try:
                 func = self.__startTagCache[name]
             except KeyError:
-                func = self.__startTagCache[name] = self.startTagHandler[name].__get__(self)
+                func = self.__startTagCache[name] = self.startTagHandler[name]
             return func(token)
 
         def startTagHtml(self, token):
@@ -474,7 +474,7 @@ def processEndTag(self, token):
             try:
                 func = self.__endTagCache[name]
             except KeyError:
-                func = self.__endTagCache[name] = self.endTagHandler[name].__get__(self)
+                func = self.__endTagCache[name] = self.endTagHandler[name]
             return func(token)
 
     class InitialPhase(Phase):
