From 5661b40942d0ddcac14a2eb3e8a9ff30b7eaca06 Mon Sep 17 00:00:00 2001
From: fate0 <6829628+fate0@users.noreply.github.com>
Date: Wed, 27 Dec 2017 01:44:43 +0800
Subject: @concurrent decorator works for class methods. (#2708)

* @concurrent decorator should works for class methods
* modify test for @concurrent decorator in class.
* add docs
---
 mitmproxy/script/concurrent.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'mitmproxy/script')

diff --git a/mitmproxy/script/concurrent.py b/mitmproxy/script/concurrent.py
index 1d935585..217fab9d 100644
--- a/mitmproxy/script/concurrent.py
+++ b/mitmproxy/script/concurrent.py
@@ -17,9 +17,14 @@ def concurrent(fn):
             "Concurrent decorator not supported for '%s' method." % fn.__name__
         )
 
-    def _concurrent(obj):
+    def _concurrent(*args):
+        # When annotating classmethods, "self" is passed as the first argument.
+        # To support both class and static methods, we accept a variable number of arguments
+        # and take the last one as our actual hook object.
+        obj = args[-1]
+
         def run():
-            fn(obj)
+            fn(*args)
             if obj.reply.state == "taken":
                 if not obj.reply.has_message:
                     obj.reply.ack()
@@ -29,8 +34,5 @@ def concurrent(fn):
             "script.concurrent (%s)" % fn.__name__,
             target=run
         ).start()
-    # Support @concurrent for class-based addons
-    if "." in fn.__qualname__:
-        return staticmethod(_concurrent)
-    else:
-        return _concurrent
+
+    return _concurrent
-- 
cgit v1.2.3