diff options
| author | Jason <jason.daurus@gmail.com> | 2016-05-28 01:11:04 +0800 |
|---|---|---|
| committer | Jason <jason.daurus@gmail.com> | 2016-05-28 01:11:04 +0800 |
| commit | 9e869f0aa17cbd202f72bab1540d866f7274a8a1 (patch) | |
| tree | 765b55027aba7685264e838d285c0587d18b9205 /pathod/app.py | |
| parent | fb639c2e11225531172fb7b452250b58295a5a58 (diff) | |
| parent | 22ecd022a84e1c3762dd425bc9bee2230e393d8d (diff) | |
| download | mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.gz mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.bz2 mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.zip | |
Merge remote-tracking branch 'origin/master' into contentview
Diffstat (limited to 'pathod/app.py')
| -rw-r--r-- | pathod/app.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pathod/app.py b/pathod/app.py index aa00ed69..7e9860b9 100644 --- a/pathod/app.py +++ b/pathod/app.py @@ -1,6 +1,6 @@ import logging import pprint -from six.moves import cStringIO as StringIO +import io import copy from flask import Flask, jsonify, render_template, request, abort, make_response from . import version, language, utils @@ -145,7 +145,7 @@ def make_app(noapi, debug): args["marked"] = v.marked() return render(template, False, **args) - s = StringIO() + s = io.BytesIO() settings = copy.copy(app.config["pathod"].settings) settings.request_host = EXAMPLE_HOST |