diff options
| author | Shadab Zafar <dufferzafar0@gmail.com> | 2016-06-21 21:46:09 +0530 |
|---|---|---|
| committer | Shadab Zafar <dufferzafar0@gmail.com> | 2016-06-22 13:38:00 +0530 |
| commit | d655d8f1f3b362201a9883d0dd03df31fddf481d (patch) | |
| tree | 4a0b547ca112c5a8cb6ef28d23d4eb6e8c9dcfe9 | |
| parent | c0ba47094d94c2c6e7eac173583fbcfc74626255 (diff) | |
| download | mitmproxy-d655d8f1f3b362201a9883d0dd03df31fddf481d.tar.gz mitmproxy-d655d8f1f3b362201a9883d0dd03df31fddf481d.tar.bz2 mitmproxy-d655d8f1f3b362201a9883d0dd03df31fddf481d.zip | |
py3++: mitmproxy.platform.pf
| -rw-r--r-- | mitmproxy/platform/pf.py | 1 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/platform/pf.py b/mitmproxy/platform/pf.py index 97a4c192..c0397d78 100644 --- a/mitmproxy/platform/pf.py +++ b/mitmproxy/platform/pf.py @@ -8,6 +8,7 @@ def lookup(address, port, s): Returns an (address, port) tuple, or None. """ + s = s.decode() spec = "%s:%s" % (address, port) for i in s.split("\n"): if "ESTABLISHED:ESTABLISHED" in i and spec in i: @@ -7,7 +7,7 @@ deps = codecov>=2.0.5 passenv = CI TRAVIS_BUILD_ID TRAVIS TRAVIS_BRANCH TRAVIS_JOB_NUMBER TRAVIS_PULL_REQUEST TRAVIS_JOB_ID TRAVIS_REPO_SLUG TRAVIS_COMMIT setenv = - PY3TESTS = 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 + PY3TESTS = 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 [testenv:py27] commands = |