[PATCH] utils: remove custom memoize decorator (streamlink#3486)

Billy2011 · Billy2011 · commit cb70ba8acda3 · 2021-03-23T12:42:26.000+01:00
diff --git a/src/streamlink/compat.py b/src/streamlink/compat.py
@@ -53,11 +53,15 @@ def bytes(b, enc="ascii"):
     from HTMLParser import HTMLParser
     html_unescape = unescape = HTMLParser().unescape
 
+try:
+    from functools import lru_cache
+except ImportError:
+    from backports.functools_lru_cache import lru_cache
 
 getargspec = getattr(inspect, "getfullargspec", inspect.getargspec)
 
 
 __all__ = ["is_py2", "is_py3", "is_py33", "is_win32", "str", "bytes",
            "urlparse", "urlunparse", "urljoin", "parse_qsl", "quote",
            "unquote", "unquote_plus", "queue", "range", "urlencode", "devnull", "which",
-           "izip", "urlsplit", "urlunsplit", "getargspec", "html_unescape"]
+           "izip", "urlsplit", "urlunsplit", "getargspec", "html_unescape", "lru_cache"]
diff --git a/src/streamlink/plugins/wwenetwork.py b/src/streamlink/plugins/wwenetwork.py
@@ -5,11 +5,10 @@
 import re
 
 from streamlink import PluginError
-from streamlink.compat import parse_qsl, urlparse
+from streamlink.compat import lru_cache, parse_qsl, urlparse
 from streamlink.plugin import Plugin, PluginArgument, PluginArguments
 from streamlink.plugin.api import useragents
 from streamlink.stream import HLSStream
-from streamlink.utils import memoize
 from streamlink.utils.times import seconds_to_hhmmss
 
 log = logging.getLogger(__name__)
@@ -93,7 +92,7 @@ def login(self, email, password):
         return self.auth_token
 
     @property
-    @memoize
+    @lru_cache(maxsize=128)
     def item_config(self):
         log.debug("Loading page config")
         p = urlparse(self.url)
diff --git a/src/streamlink/session.py b/src/streamlink/session.py
@@ -11,12 +11,12 @@
 from requests.packages.urllib3.util.connection import allowed_gai_family
 
 from streamlink import __version__, plugins
-from streamlink.compat import is_win32
+from streamlink.compat import is_win32, lru_cache
 from streamlink.exceptions import NoPluginError, PluginError
 from streamlink.logger import Logger, StreamlinkLogger
 from streamlink.options import Options
 from streamlink.plugin import api
-from streamlink.utils import memoize, update_scheme
+from streamlink.utils import update_scheme
 from streamlink.utils.l10n import Localization
 
 # Ensure that the Logger class returned is Streamslink's for using the API (for backwards compatibility)
@@ -419,7 +419,7 @@ def set_logoutput(self, output):
         """
         self.logger.set_output(output)
 
-    @memoize
+    @lru_cache(maxsize=128)
     def resolve_url(self, url, follow_redirect=True):
         """Attempts to find a plugin that can use this URL.
 
diff --git a/src/streamlink/utils/__init__.py b/src/streamlink/utils/__init__.py
@@ -1,4 +1,3 @@
-import functools
 import json
 import re
 import xml.etree.ElementTree as ET
@@ -139,18 +138,6 @@ def rtmpparse(url):
     return tcurl, playpath
 
 
-def memoize(obj):
-    cache = obj.cache = {}
-
-    @functools.wraps(obj)
-    def memoizer(*args, **kwargs):
-        key = str(args) + str(kwargs)
-        if key not in cache:
-            cache[key] = obj(*args, **kwargs)
-        return cache[key]
-    return memoizer
-
-
 def search_dict(data, key):
     """
     Search for a key in a nested dict, or list of nested dicts, and return the values.
diff --git a/tests/test_session.py b/tests/test_session.py
@@ -48,10 +48,12 @@ def test_override_plugins(self):
         self.assertEqual(plugins["testplugin"].__module__, "streamlink.plugin.testplugin_override")
 
     def test_resolve_url(self):
-        plugins = self.session.get_plugins()
-        channel = self.session.resolve_url("http://test.se/channel")
-        self.assertTrue(isinstance(channel, Plugin))
-        self.assertTrue(isinstance(channel, plugins["testplugin"]))
+        session = self.subject()
+        plugins = session.get_plugins()
+        plugin = session.resolve_url("http://test.se/channel")
+        self.assertTrue(isinstance(plugin, Plugin))
+        self.assertTrue(isinstance(plugin, plugins["testplugin"]))
+        self.assertTrue(hasattr(session.resolve_url, "cache_info"), "resolve_url has a lookup cache")
 
     def test_resolve_url_priority(self):
         from tests.plugins.testplugin import TestPlugin
