diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-28 20:59:51 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-28 20:59:51 +1200 |
| commit | 4632cb5dbdc3a1eb3ebec8d3681d04a9b2e76fdc (patch) | |
| tree | 75f56bf3e1bc8a1764fdb2e51061a9346ae2273e | |
| parent | 00426534982ab7fba5617ad6422c13483a8e6521 (diff) | |
| parent | fa7964988f1541587a9fc3b582223e0a7b11a4d1 (diff) | |
| download | mitmproxy-4632cb5dbdc3a1eb3ebec8d3681d04a9b2e76fdc.tar.gz mitmproxy-4632cb5dbdc3a1eb3ebec8d3681d04a9b2e76fdc.tar.bz2 mitmproxy-4632cb5dbdc3a1eb3ebec8d3681d04a9b2e76fdc.zip | |
Merge branch 'master' into solidcore
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | test/pathod/test_log.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 4a01174a..0c37b53f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,9 @@ matrix: git: depth: 9999999 - python: 3.5 - env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py" + env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py ./test/pathod/test_log.py" - python: 3.5 - env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py" NO_ALPN=1 + env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py ./test/pathod/test_log.py" NO_ALPN=1 - python: 2.7 env: DOCS=1 script: 'cd docs && make html' diff --git a/test/pathod/test_log.py b/test/pathod/test_log.py index d91b8bb1..29801eb3 100644 --- a/test/pathod/test_log.py +++ b/test/pathod/test_log.py @@ -1,10 +1,10 @@ -import StringIO from pathod import log from netlib.exceptions import TcpDisconnect -import netlib.tcp +import six -class DummyIO(StringIO.StringIO): + +class DummyIO(six.StringIO): def start_log(self, *args, **kwargs): pass |