diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
| commit | ed415877d48251774012bd6aad4be91e9d558b79 (patch) | |
| tree | e12a399c6df498f24aa5eeb9652dfaa90ab98dae /test/pathod/test_log.py | |
| parent | 00426534982ab7fba5617ad6422c13483a8e6521 (diff) | |
| parent | 7971dce2231bc32c25b962d425d8ad935568a699 (diff) | |
| download | mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.gz mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.bz2 mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.zip | |
Merge branch 'master' into solidcore
Diffstat (limited to 'test/pathod/test_log.py')
| -rw-r--r-- | test/pathod/test_log.py | 6 |
1 files changed, 3 insertions, 3 deletions
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 |