structure libmproxy.script

2 files changed, 14 insertions, 13 deletions

diff --git a/test/test_examples.py b/test/test_examples.py
index dce257cf..2a30f9d5 100644
--- a/test/test_examples.py
+++ b/test/test_examples.py
@@ -22,7 +22,7 @@ def test_load_scripts():
         if "modify_response_body" in f:
             f += " foo bar"  # two arguments required
         try:
-            s = script.Script(f, tmaster)  # Loads the script file.
+            s = script.Script(f, script.ScriptContext(tmaster))  # Loads the script file.
         except Exception as v:
             if "ImportError" not in str(v):
                 raise
diff --git a/test/test_script.py b/test/test_script.py
index 8612d5f3..fbe3e107 100644
--- a/test/test_script.py
+++ b/test/test_script.py
@@ -9,13 +9,13 @@ def test_simple():
     s = flow.State()
     fm = flow.FlowMaster(None, s)
     sp = tutils.test_data.path("scripts/a.py")
-    p = script.Script("%s --var 40" % sp, fm)
+    p = script.Script("%s --var 40" % sp, script.ScriptContext(fm))
 
     assert "here" in p.ns
     assert p.run("here") == 41
     assert p.run("here") == 42
 
-    tutils.raises(script.ScriptError, p.run, "errargs")
+    tutils.raises(script.ScriptException, p.run, "errargs")
 
     # Check reload
     p.load()
@@ -36,29 +36,30 @@ def test_duplicate_flow():
 def test_err():
     s = flow.State()
     fm = flow.FlowMaster(None, s)
+    sc = script.ScriptContext(fm)
 
     tutils.raises(
         "not found",
-        script.Script, "nonexistent", fm
+        script.Script, "nonexistent", sc
     )
 
     tutils.raises(
         "not a file",
-        script.Script, tutils.test_data.path("scripts"), fm
+        script.Script, tutils.test_data.path("scripts"), sc
     )
 
     tutils.raises(
-        script.ScriptError,
-        script.Script, tutils.test_data.path("scripts/syntaxerr.py"), fm
+        script.ScriptException,
+        script.Script, tutils.test_data.path("scripts/syntaxerr.py"), sc
     )
 
     tutils.raises(
-        script.ScriptError,
-        script.Script, tutils.test_data.path("scripts/loaderr.py"), fm
+        script.ScriptException,
+        script.Script, tutils.test_data.path("scripts/loaderr.py"), sc
     )
 
-    scr = script.Script(tutils.test_data.path("scripts/unloaderr.py"), fm)
-    tutils.raises(script.ScriptError, scr.unload)
+    scr = script.Script(tutils.test_data.path("scripts/unloaderr.py"), sc)
+    tutils.raises(script.ScriptException, scr.unload)
 
 
 def test_concurrent():
@@ -84,7 +85,7 @@ def test_concurrent2():
     fm = flow.FlowMaster(None, s)
     s = script.Script(
         tutils.test_data.path("scripts/concurrent_decorator.py"),
-        fm)
+        script.ScriptContext(fm))
     s.load()
     m = mock.Mock()
 
@@ -125,6 +126,6 @@ def test_command_parsing():
     s = flow.State()
     fm = flow.FlowMaster(None, s)
     absfilepath = os.path.normcase(tutils.test_data.path("scripts/a.py"))
-    s = script.Script(absfilepath, fm)
+    s = script.Script(absfilepath, script.ScriptContext(fm))
     assert os.path.isfile(s.args[0])