diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-28 23:48:19 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-28 23:48:19 -0700 |
| commit | f7d4319c5aa5ea49eefbbef0424cee074e326960 (patch) | |
| tree | 3a1718f6328403bfbd1dff9789a71cf5792bc44c | |
| parent | 7cae0c268f728a6dafede4cc04fabdad1f3e5c52 (diff) | |
| download | mitmproxy-f7d4319c5aa5ea49eefbbef0424cee074e326960.tar.gz mitmproxy-f7d4319c5aa5ea49eefbbef0424cee074e326960.tar.bz2 mitmproxy-f7d4319c5aa5ea49eefbbef0424cee074e326960.zip | |
minor fixes
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | mitmproxy/script/reloader.py | 1 | ||||
| -rw-r--r-- | test/mitmproxy/data/scripts/tcp_stream_modify.py | 2 | ||||
| -rw-r--r-- | tox.ini | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a6f75913..29d0897c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ addons: env: global: - - TOXENV=py - CI_DEPS=codecov>=2.0.5 - CI_COMMANDS=codecov diff --git a/mitmproxy/script/reloader.py b/mitmproxy/script/reloader.py index 0a3f5c93..50401034 100644 --- a/mitmproxy/script/reloader.py +++ b/mitmproxy/script/reloader.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, print_function, division import os -import sys from watchdog.events import RegexMatchingEventHandler diff --git a/test/mitmproxy/data/scripts/tcp_stream_modify.py b/test/mitmproxy/data/scripts/tcp_stream_modify.py index d7953ef9..0965beba 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): message = flow.messages[-1] if not message.from_client: - message.content = message.content.replace("foo", "bar") + message.content = message.content.replace(b"foo", b"bar") @@ -17,6 +17,7 @@ commands = [testenv:py35] setenv = TESTS = test/netlib test/pathod/ test/mitmproxy/script test/mitmproxy/test_contentview.py test/mitmproxy/test_custom_contentview.py test/mitmproxy/test_app.py test/mitmproxy/test_controller.py test/mitmproxy/test_fuzzing.py test/mitmproxy/test_script.py test/mitmproxy/test_web_app.py test/mitmproxy/test_utils.py test/mitmproxy/test_stateobject.py test/mitmproxy/test_cmdline.py test/mitmproxy/test_contrib_tnetstring.py test/mitmproxy/test_proxy.py test/mitmproxy/test_protocol_http1.py test/mitmproxy/test_platform_pf.py + HOME = {envtmpdir} [testenv:docs] basepython = python |