aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/app.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-05-26 12:09:39 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-05-26 12:09:39 -0700
commit22ecd022a84e1c3762dd425bc9bee2230e393d8d (patch)
tree47f7cac0e86c715bc32e955072fbe59f06d589cf /pathod/app.py
parentd149c447fe9d3ec359271270ed1c32c2c7da6aad (diff)
parent92317bc81d72f243095a1bfa192f568637d9bc32 (diff)
downloadmitmproxy-22ecd022a84e1c3762dd425bc9bee2230e393d8d.tar.gz
mitmproxy-22ecd022a84e1c3762dd425bc9bee2230e393d8d.tar.bz2
mitmproxy-22ecd022a84e1c3762dd425bc9bee2230e393d8d.zip
Merge pull request #1119 from dufferzafar/pathod-port
Python 3 - pathod.utils
Diffstat (limited to 'pathod/app.py')
-rw-r--r--pathod/app.py4
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