diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 17:03:02 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 17:03:02 +1300 |
| commit | ae3ff8ee1edc646e7a640219df1a312c27f7c339 (patch) | |
| tree | 490697113ceaf12cc704c418357139e60a0190f3 /pathod/test.py | |
| parent | 3fbce7e981cab5d20b3ef17a50f14b34e8c60fa3 (diff) | |
| parent | ce98a9219e060b729d4b0d2dc28bf4510649f0fd (diff) | |
| download | mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.gz mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.bz2 mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.zip | |
Merge pull request #1615 from cortesi/python3a
exterminate six
Diffstat (limited to 'pathod/test.py')
| -rw-r--r-- | pathod/test.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pathod/test.py b/pathod/test.py index 4992945d..c92cc50b 100644 --- a/pathod/test.py +++ b/pathod/test.py @@ -1,7 +1,6 @@ -from six.moves import cStringIO as StringIO +import io import time - -from six.moves import queue +import queue from . import pathod from netlib import basethread @@ -12,7 +11,7 @@ class Daemon: def __init__(self, ssl=None, **daemonargs): self.q = queue.Queue() - self.logfp = StringIO() + self.logfp = io.StringIO() daemonargs["logfp"] = self.logfp self.thread = _PaThread(self.IFACE, self.q, ssl, daemonargs) self.thread.start() |