models(base), tests(test_queue_job): remove _patch_method; patch in _register_hook; fix auto-delay wrapper

- Remove unused `_patch_method` from Base per review
- Update docstring example to patch methods in `_register_hook`
- Adjust test models to patch using `functools.update_wrapper`
- Fix auto-delay wrapper to store unbound origin and bind at call time

Functional change limited to patching helper/tests; no manifest changes.

Author: Milan Topuzov

queue_job/models/base.py

@@ -193,9 +193,17 @@ def foo_job_options(self, arg1):
                 }
 
             def _register_hook(self):
-                self._patch_method(
+                # patch the method at registry time
+                patched = self._patch_job_auto_delay(
+                    "foo", context_key="auto_delay_foo"
+                )
+                setattr(
+                    type(self),
                     "foo",
-                    self._patch_job_auto_delay("foo", context_key="auto_delay_foo")
+                    functools.update_wrapper(
+                        patched,
+                        getattr(type(self), "foo"),
+                    ),
                 )
                 return super()._register_hook()
 
@@ -224,8 +232,9 @@ def auto_delay_wrapper(self, *args, **kwargs):
                 delayed = self.with_delay(**job_options)
                 return getattr(delayed, method_name)(*args, **kwargs)
 
-        origin = getattr(self, method_name)
-        return functools.update_wrapper(auto_delay_wrapper, origin)
+        origin_func = getattr(type(self), method_name)
+        auto_delay_wrapper.origin = origin_func
+        return functools.update_wrapper(auto_delay_wrapper, origin_func)
 
     @api.model
     def _job_store_values(self, job):
@@ -260,26 +269,5 @@ def _job_prepare_context_before_enqueue(self):
             if key in self._job_prepare_context_before_enqueue_keys()
         }
 
-    @classmethod
-    def _patch_method(cls, name, method):
-        """``api.propagate`` is no longer exposed. We emulate the
-        propagation by using ``functools.update_wrapper`` and copying the
-        decorator metadata which Odoo relies on (see orm.decorators).
-        """
-        origin = getattr(cls, name)
-        method.origin = origin
-        # carry over wrapper attributes (name, doc, etc.)
-        wrapped = functools.update_wrapper(method, origin)
-        # propagate common decorator metadata used by the framework
-        for attr in (
-            "_constrains",
-            "_depends",
-            "_onchange",
-            "_ondelete",
-            "_api_model",
-            "_api_private",
-        ):
-            if hasattr(origin, attr):
-                setattr(wrapped, attr, getattr(origin, attr))
-        wrapped.origin = origin
-        setattr(cls, name, wrapped)
+    # Note: no local _patch_method helper; if needed, patch methods
+    # directly in _register_hook as shown above.

test_queue_job/models/test_models.py

@@ -1,6 +1,7 @@
 # Copyright 2016 Camptocamp SA
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
 
+import functools
 from datetime import datetime, timedelta
 
 from odoo import api, fields, models
@@ -127,15 +128,20 @@ def delay_me_context_key(self):
         return "ok"
 
     def _register_hook(self):
-        self._patch_method("delay_me", self._patch_job_auto_delay("delay_me"))
-        self._patch_method(
-            "delay_me_options", self._patch_job_auto_delay("delay_me_options")
+        patched = self._patch_job_auto_delay("delay_me")
+        type(self).delay_me = functools.update_wrapper(patched, type(self).delay_me)
+
+        patched = self._patch_job_auto_delay("delay_me_options")
+        type(self).delay_me_options = functools.update_wrapper(
+            patched, type(self).delay_me_options
         )
-        self._patch_method(
+
+        patched = self._patch_job_auto_delay(
             "delay_me_context_key",
-            self._patch_job_auto_delay(
-                "delay_me_context_key", context_key="auto_delay_delay_me_context_key"
-            ),
+            context_key="auto_delay_delay_me_context_key",
+        )
+        type(self).delay_me_context_key = functools.update_wrapper(
+            patched, type(self).delay_me_context_key
         )
         return super()._register_hook()