diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-03-20 19:40:03 +0100 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-03-20 19:40:03 +0100 |
commit | 88d365cfe671bc5c8d96e78334337aa84cc815da (patch) | |
tree | 21a9bfd946cc5b8958d1b3549a277b51a456ba19 /pathod | |
parent | 61a657fe56949732d6470862c2ebbe09141f85f2 (diff) | |
download | mitmproxy-88d365cfe671bc5c8d96e78334337aa84cc815da.tar.gz mitmproxy-88d365cfe671bc5c8d96e78334337aa84cc815da.tar.bz2 mitmproxy-88d365cfe671bc5c8d96e78334337aa84cc815da.zip |
py3++: cStringIO
Diffstat (limited to 'pathod')
-rw-r--r-- | pathod/app.py | 4 | ||||
-rw-r--r-- | pathod/test.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pathod/app.py b/pathod/app.py index c6b7eabc..aa00ed69 100644 --- a/pathod/app.py +++ b/pathod/app.py @@ -1,6 +1,6 @@ import logging import pprint -import cStringIO +from six.moves import cStringIO as StringIO 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 = cStringIO.StringIO() + s = StringIO() settings = copy.copy(app.config["pathod"].settings) settings.request_host = EXAMPLE_HOST diff --git a/pathod/test.py b/pathod/test.py index 33a6b763..a2552376 100644 --- a/pathod/test.py +++ b/pathod/test.py @@ -1,4 +1,4 @@ -import cStringIO +from six.moves import cStringIO as StringIO import threading import Queue @@ -14,7 +14,7 @@ class Daemon: def __init__(self, ssl=None, **daemonargs): self.q = Queue.Queue() - self.logfp = cStringIO.StringIO() + self.logfp = StringIO() daemonargs["logfp"] = self.logfp self.thread = _PaThread(self.IFACE, self.q, ssl, daemonargs) self.thread.start() |