diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-07 16:05:16 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-07 16:05:16 +0200 |
| commit | 8dfa15c2d460839667092e578311fad53cf7bea9 (patch) | |
| tree | 3b8a9a2f016a6bcb87214b1ccc6b3fbc9fc6e651 | |
| parent | d002371d30e4b0ab7d1d23023236a9446d4c2396 (diff) | |
| download | mitmproxy-8dfa15c2d460839667092e578311fad53cf7bea9.tar.gz mitmproxy-8dfa15c2d460839667092e578311fad53cf7bea9.tar.bz2 mitmproxy-8dfa15c2d460839667092e578311fad53cf7bea9.zip | |
whitelist next_layer for @concurrent
| -rw-r--r-- | libmproxy/script.py | 3 | ||||
| -rw-r--r-- | setup.py | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/libmproxy/script.py b/libmproxy/script.py index e13f0e2b..db909a5d 100644 --- a/libmproxy/script.py +++ b/libmproxy/script.py @@ -179,7 +179,8 @@ def concurrent(fn): "error", "clientconnect", "serverconnect", - "clientdisconnect"): + "clientdisconnect", + "next_layer"): def _concurrent(ctx, obj): _handle_concurrent_reply(fn, obj, ctx, obj) @@ -83,7 +83,8 @@ setup( "Topic :: Internet", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: Proxy Servers", - "Topic :: Software Development :: Testing"], + "Topic :: Software Development :: Testing" + ], packages=find_packages(), include_package_data=True, entry_points={ @@ -94,8 +95,13 @@ setup( 'contentviews': [ "pyamf>=0.6.1", "protobuf>=2.5.0", - "cssutils>=1.0"], + "cssutils>=1.0" + ], 'examples': [ "pytz", "harparser", - "beautifulsoup4"]}) + "beautifulsoup4", + "enum34" + ] + } +) |