diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-06-07 12:56:51 +1200 |
| commit | 75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34 (patch) | |
| tree | 9bff77b84d485549f2d9cfad61a4c54b6315088d /test/pathod/tutils.py | |
| parent | e037fe05ff1f0c2893b3f51e06e0261ca4245d63 (diff) | |
| parent | 80292c0ac3c9684ee945546c9b45334178518e4e (diff) | |
| download | mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.gz mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.tar.bz2 mitmproxy-75ebd638eb6f6ed74f1f191d4f9e30277f4f2d34.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'test/pathod/tutils.py')
| -rw-r--r-- | test/pathod/tutils.py | 3 |
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() |