aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/script
diff options
context:
space:
mode:
authorMatthew Shao <me@matshao.com>2017-02-21 11:59:50 +0800
committerMatthew Shao <me@matshao.com>2017-02-21 11:59:50 +0800
commitf9714fbf3e595ba4c93ef036bfe63e3b63e256ab (patch)
tree68b6bb6cb55dd82a9424625d68dd9fedab9b001b /mitmproxy/script
parent18401dda8f293434410fba066afe9235740be98b (diff)
downloadmitmproxy-f9714fbf3e595ba4c93ef036bfe63e3b63e256ab.tar.gz
mitmproxy-f9714fbf3e595ba4c93ef036bfe63e3b63e256ab.tar.bz2
mitmproxy-f9714fbf3e595ba4c93ef036bfe63e3b63e256ab.zip
Fix #1928, @concurrent decorator now works for class methods.
Diffstat (limited to 'mitmproxy/script')
-rw-r--r--mitmproxy/script/concurrent.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/mitmproxy/script/concurrent.py b/mitmproxy/script/concurrent.py
index 366929a5..87cdca96 100644
--- a/mitmproxy/script/concurrent.py
+++ b/mitmproxy/script/concurrent.py
@@ -29,4 +29,7 @@ def concurrent(fn):
"script.concurrent (%s)" % fn.__name__,
target=run
).start()
- return _concurrent
+ if "." in fn.__qualname__:
+ return staticmethod(_concurrent)
+ else:
+ return _concurrent