aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-03-20 11:31:56 +0100
committerMaximilian Hils <git@maximilianhils.com>2016-03-20 11:31:56 +0100
commit61a657fe56949732d6470862c2ebbe09141f85f2 (patch)
tree4100dfe09af0d42b44f11ed8ac9dbdbe5f9d3e5d /test
parentd99194fcccf639008cc140f4cb432b18e1296e57 (diff)
parentb0a16dee2071ba90e0363c55a566902d680b9d64 (diff)
downloadmitmproxy-61a657fe56949732d6470862c2ebbe09141f85f2.tar.gz
mitmproxy-61a657fe56949732d6470862c2ebbe09141f85f2.tar.bz2
mitmproxy-61a657fe56949732d6470862c2ebbe09141f85f2.zip
Merge pull request #1045 from mitmproxy/py3-scripts
Port mitmproxy.script to Python 3
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/tutils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/mitmproxy/tutils.py b/test/mitmproxy/tutils.py
index 791db6d9..191eb966 100644
--- a/test/mitmproxy/tutils.py
+++ b/test/mitmproxy/tutils.py
@@ -3,7 +3,7 @@ import shutil
import tempfile
import argparse
import sys
-from cStringIO import StringIO
+from six.moves import cStringIO as StringIO
from contextlib import contextmanager
from unittest.case import SkipTest