aboutsummaryrefslogtreecommitdiffstats
path: root/test/pathod/tutils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-06-06 15:59:24 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-06-06 15:59:24 -0700
commitf2f5beb75d60954c88922fc7f483c289cc5d4a7d (patch)
treec269773538e8c663346191da69e824cbea06d5de /test/pathod/tutils.py
parent7cb7d9ad32c40cff9ceb0e28a5123960fed3638e (diff)
parent2ee5e8ef0e632545038a72f0cedc0320c59b00ff (diff)
downloadmitmproxy-f2f5beb75d60954c88922fc7f483c289cc5d4a7d.tar.gz
mitmproxy-f2f5beb75d60954c88922fc7f483c289cc5d4a7d.tar.bz2
mitmproxy-f2f5beb75d60954c88922fc7f483c289cc5d4a7d.zip
Merge branch 'pathod-lang-http'
Diffstat (limited to 'test/pathod/tutils.py')
-rw-r--r--test/pathod/tutils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/pathod/tutils.py b/test/pathod/tutils.py
index 56cd2002..bf5e3165 100644
--- a/test/pathod/tutils.py
+++ b/test/pathod/tutils.py
@@ -3,6 +3,7 @@ import re
import shutil
import requests
from six.moves import cStringIO as StringIO
+from six import BytesIO
import urllib
from netlib import tcp
@@ -147,6 +148,6 @@ test_data = utils.Data(__name__)
def render(r, settings=language.Settings()):
r = r.resolve(settings)
- s = StringIO()
+ s = BytesIO()
assert language.serve(r, s, settings)
return s.getvalue()