diff options
author | Aldo Cortesi <aldo@corte.si> | 2016-06-14 15:25:01 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-14 15:25:01 +1200 |
commit | d8ae2f156203a81a8e6d325f5c460c351cfbfc5c (patch) | |
tree | 8b5e8ef981b6f691dcbbd504883714cb2f6fc182 /test | |
parent | ccf4723505935f759c1bff5c5cc7d6d986726422 (diff) | |
parent | c2b5a13e3f1cfd193184c2fca9df0d531501a8ab (diff) | |
download | mitmproxy-d8ae2f156203a81a8e6d325f5c460c351cfbfc5c.tar.gz mitmproxy-d8ae2f156203a81a8e6d325f5c460c351cfbfc5c.tar.bz2 mitmproxy-d8ae2f156203a81a8e6d325f5c460c351cfbfc5c.zip |
Merge pull request #1254 from mitmproxy/scriptargs
Inline Scripts: use sys.argv instead of args argument.
Diffstat (limited to 'test')
-rw-r--r-- | test/mitmproxy/data/scripts/a.py | 6 | ||||
-rw-r--r-- | test/mitmproxy/data/scripts/concurrent_decorator_err.py | 2 | ||||
-rw-r--r-- | test/mitmproxy/data/scripts/starterr.py | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/test/mitmproxy/data/scripts/a.py b/test/mitmproxy/data/scripts/a.py index d4272ac8..33dbaa64 100644 --- a/test/mitmproxy/data/scripts/a.py +++ b/test/mitmproxy/data/scripts/a.py @@ -1,11 +1,13 @@ +import sys + from a_helper import parser var = 0 -def start(ctx, argv): +def start(ctx): global var - var = parser.parse_args(argv[1:]).var + var = parser.parse_args(sys.argv[1:]).var def here(ctx): diff --git a/test/mitmproxy/data/scripts/concurrent_decorator_err.py b/test/mitmproxy/data/scripts/concurrent_decorator_err.py index 071b8889..349e5dd6 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, argv): +def start(context): pass diff --git a/test/mitmproxy/data/scripts/starterr.py b/test/mitmproxy/data/scripts/starterr.py index b217bdfe..82d773bd 100644 --- a/test/mitmproxy/data/scripts/starterr.py +++ b/test/mitmproxy/data/scripts/starterr.py @@ -1,3 +1,3 @@ -def start(ctx, argv): - raise ValueError +def start(ctx): + raise ValueError() |