simplify the definition of caching_class_method_decorator, thanks to Julien.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29739 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/Cache.py

@@ -278,13 +278,6 @@ def generateCacheIdWithoutFirstArg(method_id, *args, **kwd):
   # is 'self' that can be ignored to create a cache id.
   return str((method_id, args[1:], kwd))
 
-class caching_class_method_decorator:
-  def __init__(self, *args, **kw):
-    self.args = args
-    kw.setdefault(
-      'cache_id_func', generateCacheIdWithoutFirstArg)
-    self.kw = kw
-
-  def __call__(self, method):
-    caching_method = CachingMethod(method, *self.args, **self.kw)
-    return lambda *args, **kw: caching_method(*args, **kw)
+def caching_class_method_decorator(*args, **kw):
+  kw.setdefault('cache_id_func', generateCacheIdWithoutFirstArg)
+  return lambda method: CachingMethod(method, *args, **kw)

product/ZSQLCatalog/SQLCatalog.py

@@ -84,11 +84,8 @@ except ImportError:
       self.function = callable
     def __call__(self, *opts, **kw):
       return self.function(*opts, **kw)
-  class caching_class_method_decorator:
-    def __init__(self, *args, **kw):
-      pass
-    def __call__(self, method):
-      return method
+  def caching_class_method_decorator(*args, **kw):
+    return lambda method: method
   enableReadOnlyTransactionCache = doNothing
   disableReadOnlyTransactionCache = doNothing