10 files changed, 30 insertions, 27 deletions
diff --git a/test/mitmproxy/data/scripts/a.py b/test/mitmproxy/data/scripts/a.py
index 33dbaa64..ab0dbf96 100644
--- a/test/mitmproxy/data/scripts/a.py
+++ b/test/mitmproxy/data/scripts/a.py
@@ -5,12 +5,12 @@ from a_helper import parser
 var = 0
 
 
-def start(ctx):
+def start():
     global var
     var = parser.parse_args(sys.argv[1:]).var
 
 
-def here(ctx):
+def here():
     global var
     var += 1
     return var
diff --git a/test/mitmproxy/data/scripts/all.py b/test/mitmproxy/data/scripts/all.py
index dad2aade..17ffe33f 100644
--- a/test/mitmproxy/data/scripts/all.py
+++ b/test/mitmproxy/data/scripts/all.py
@@ -1,36 +1,37 @@
+import mitmproxy
 log = []
 
 
-def clientconnect(ctx, cc):
-    ctx.log("XCLIENTCONNECT")
+def clientconnect(cc):
+    mitmproxy.log("XCLIENTCONNECT")
     log.append("clientconnect")
 
 
-def serverconnect(ctx, cc):
-    ctx.log("XSERVERCONNECT")
+def serverconnect(cc):
+    mitmproxy.log("XSERVERCONNECT")
     log.append("serverconnect")
 
 
-def request(ctx, f):
-    ctx.log("XREQUEST")
+def request(f):
+    mitmproxy.log("XREQUEST")
     log.append("request")
 
 
-def response(ctx, f):
-    ctx.log("XRESPONSE")
+def response(f):
+    mitmproxy.log("XRESPONSE")
     log.append("response")
 
 
-def responseheaders(ctx, f):
-    ctx.log("XRESPONSEHEADERS")
+def responseheaders(f):
+    mitmproxy.log("XRESPONSEHEADERS")
     log.append("responseheaders")
 
 
-def clientdisconnect(ctx, cc):
-    ctx.log("XCLIENTDISCONNECT")
+def clientdisconnect(cc):
+    mitmproxy.log("XCLIENTDISCONNECT")
     log.append("clientdisconnect")
 
 
-def error(ctx, cc):
-    ctx.log("XERROR")
+def error(cc):
+    mitmproxy.log("XERROR")
     log.append("error")
diff --git a/test/mitmproxy/data/scripts/concurrent_decorator.py b/test/mitmproxy/data/scripts/concurrent_decorator.py
index e017f605..162c00f4 100644
--- a/test/mitmproxy/data/scripts/concurrent_decorator.py
+++ b/test/mitmproxy/data/scripts/concurrent_decorator.py
@@ -3,5 +3,5 @@ from mitmproxy.script import concurrent
 
 
 @concurrent
-def request(context, flow):
+def request(flow):
     time.sleep(0.1)
diff --git a/test/mitmproxy/data/scripts/concurrent_decorator_err.py b/test/mitmproxy/data/scripts/concurrent_decorator_err.py
index 349e5dd6..756869c8 100644
--- a/test/mitmproxy/data/scripts/concurrent_decorator_err.py
+++ b/test/mitmproxy/data/scripts/concurrent_decorator_err.py
@@ -2,5 +2,5 @@ from mitmproxy.script import concurrent
 
 
 @concurrent
-def start(context):
+def start():
     pass
diff --git a/test/mitmproxy/data/scripts/duplicate_flow.py b/test/mitmproxy/data/scripts/duplicate_flow.py
index e13af786..a50d2cb5 100644
--- a/test/mitmproxy/data/scripts/duplicate_flow.py
+++ b/test/mitmproxy/data/scripts/duplicate_flow.py
@@ -1,4 +1,6 @@
+import mitmproxy
 
-def request(ctx, f):
-    f = ctx.duplicate_flow(f)
-    ctx.replay_request(f)
+
+def request(f):
+    f = mitmproxy.master.duplicate_flow(f)
+    mitmproxy.master.replay_request(f, block=True, run_scripthooks=False)
diff --git a/test/mitmproxy/data/scripts/reqerr.py b/test/mitmproxy/data/scripts/reqerr.py
index e7c503a8..7b419361 100644
--- a/test/mitmproxy/data/scripts/reqerr.py
+++ b/test/mitmproxy/data/scripts/reqerr.py
@@ -1,2 +1,2 @@
-def request(ctx, r):
-    raise ValueError
+def request(r):
+    raise ValueError()
diff --git a/test/mitmproxy/data/scripts/starterr.py b/test/mitmproxy/data/scripts/starterr.py
index 82d773bd..28ba2ff1 100644
--- a/test/mitmproxy/data/scripts/starterr.py
+++ b/test/mitmproxy/data/scripts/starterr.py
@@ -1,3 +1,3 @@
 
-def start(ctx):
+def start():
     raise ValueError()
diff --git a/test/mitmproxy/data/scripts/stream_modify.py b/test/mitmproxy/data/scripts/stream_modify.py
index 8221b0dd..4fbf45c2 100644
--- a/test/mitmproxy/data/scripts/stream_modify.py
+++ b/test/mitmproxy/data/scripts/stream_modify.py
@@ -3,5 +3,5 @@ def modify(chunks):
         yield chunk.replace(b"foo", b"bar")
 
 
-def responseheaders(context, flow):
+def responseheaders(flow):
     flow.response.stream = modify
diff --git a/test/mitmproxy/data/scripts/tcp_stream_modify.py b/test/mitmproxy/data/scripts/tcp_stream_modify.py
index 0965beba..2281e6e6 100644
--- a/test/mitmproxy/data/scripts/tcp_stream_modify.py
+++ b/test/mitmproxy/data/scripts/tcp_stream_modify.py
@@ -1,4 +1,4 @@
-def tcp_message(ctx, flow):
+def tcp_message(flow):
     message = flow.messages[-1]
     if not message.from_client:
         message.content = message.content.replace(b"foo", b"bar")
diff --git a/test/mitmproxy/data/scripts/unloaderr.py b/test/mitmproxy/data/scripts/unloaderr.py
index fba02734..6a48ab43 100644
--- a/test/mitmproxy/data/scripts/unloaderr.py
+++ b/test/mitmproxy/data/scripts/unloaderr.py
@@ -1,2 +1,2 @@
-def done(ctx):
+def done():
     raise RuntimeError()