Dev: Use functools.cache instead of custom memoize (#1939)

Since functools.cache is available in Python 3.9+, remove file pyshim.py
and function utils.memoize.

Author: liangxin1300

crmsh/pyshim.py

@@ -6,6 +6,7 @@
 import copy
 import re
 import glob
+import functools
 from lxml import etree
 from . import cache
 from . import constants
@@ -102,7 +103,7 @@ def include(ra):
     return cache.store(ident, sorted(list(set(ra for ra in find_types() if include(ra)))))
 
 
-@utils.memoize
+@functools.cache
 def ra_meta(ra_class, ra_type, ra_provider):
     """
     Return metadata for the given class/type/provider
@@ -112,12 +113,12 @@ def ra_meta(ra_class, ra_type, ra_provider):
     return crm_resource("--show-metadata %s:%s" % (ra_class, ra_type))
 
 
-@utils.memoize
+@functools.cache
 def get_stonithd_meta():
     return RAInfo(utils.pacemaker_fenced(), "metadata")
 
 
-@utils.memoize
+@functools.cache
 def get_properties_meta():
     cluster_option_meta = utils.get_cluster_option_metadata()
     if cluster_option_meta:
@@ -128,28 +129,28 @@ def get_properties_meta():
         raise ValueError("No cluster option metadata found")
 
 
-@utils.memoize
+@functools.cache
 def get_property_options(property_name):
     return get_properties_meta().param_options(property_name)
 
 
-@utils.memoize
+@functools.cache
 def get_properties_list():
     try:
         return list(get_properties_meta().params().keys())
     except:
         return []
 
 
-@utils.memoize
+@functools.cache
 def get_resource_meta():
     resource_meta = utils.get_resource_metadata()
     if resource_meta:
         return RAInfo("resource_meta", None, meta_string=resource_meta)
     return None
 
 
-@utils.memoize
+@functools.cache
 def get_resource_meta_list():
     try:
         return list(get_resource_meta().params().keys())

crmsh/ra.py

@@ -1,7 +1,6 @@
 import subprocess
 import typing
 
-import crmsh.pyshim
 import crmsh.sh
 import crmsh.userdir
 

crmsh/report/sh.py

@@ -26,9 +26,9 @@
 import subprocess
 import typing
 from io import StringIO
+from functools import cache
 
 from . import constants
-from .pyshim import cache
 from . import user_of_host
 from .user_of_host import UserOfHost
 

crmsh/sh.py

@@ -7,6 +7,7 @@
 import time
 import re
 import bz2
+from functools import cache
 from . import config
 from . import command
 from . import completers as compl
@@ -28,7 +29,7 @@
 ptest_options = ["@v+", "nograph", "scores", "actions", "utilization"]
 
 
-@utils.memoize
+@cache
 def crm_report():
     return history.Report()
 

crmsh/ui_history.py

@@ -4,11 +4,11 @@
 import subprocess
 import time
 import typing
+from functools import cache
 
 from . import config
 from . import constants
 from . import userdir
-from .pyshim import cache
 
 
 logger = logging.getLogger(__name__)

crmsh/user_of_host.py

@@ -20,7 +20,6 @@
 import string
 import pwd
 import grp
-import functools
 import gzip
 import bz2
 import lzma
@@ -33,6 +32,7 @@
 from lxml import etree
 from packaging import version
 from enum import IntFlag, auto
+from functools import cache
 
 import crmsh.parallax
 import crmsh.user_of_host
@@ -97,20 +97,6 @@ def raise_exception(e):
     raise e
 
 
-def memoize(function):
-    "Decorator to invoke a function once only for any argument"
-    memoized = {}
-
-    @functools.wraps(function)
-    def inner(*args):
-        if args in memoized:
-            return memoized[args]
-        r = function(*args)
-        memoized[args] = r
-        return r
-    return inner
-
-
 @contextmanager
 def nogc():
     gc.disable()
@@ -135,7 +121,7 @@ def user_pair_for_ssh(host):
         raise ValueError('Can not create ssh session from {} to {}.'.format(this_node(), host))
 
 
-@memoize
+@cache
 def this_node():
     'returns name of this node (hostname)'
     return os.uname()[1]
@@ -202,37 +188,37 @@ def pacemaker_20_daemon(new, old):
     return old
 
 
-@memoize
+@cache
 def pacemaker_attrd():
     return pacemaker_20_daemon("pacemaker-attrd", "attrd")
 
 
-@memoize
+@cache
 def pacemaker_based():
     return pacemaker_20_daemon("pacemaker-based", "cib")
 
 
-@memoize
+@cache
 def pacemaker_controld():
     return pacemaker_20_daemon("pacemaker-controld", "crmd")
 
 
-@memoize
+@cache
 def pacemaker_execd():
     return pacemaker_20_daemon("pacemaker-execd", "lrmd")
 
 
-@memoize
+@cache
 def pacemaker_fenced():
     return pacemaker_20_daemon("pacemaker-fenced", "stonithd")
 
 
-@memoize
+@cache
 def pacemaker_remoted():
     return pacemaker_20_daemon("pacemaker-remoted", "pacemaker_remoted")
 
 
-@memoize
+@cache
 def pacemaker_schedulerd():
     return pacemaker_20_daemon("pacemaker-schedulerd", "pengine")
 
@@ -2042,7 +2028,7 @@ def detect_gcp():
     return False
 
 
-@memoize
+@cache
 def detect_cloud():
     """
     Tries to determine which (if any) cloud environment