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 /test/netlib/tservers.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 'test/netlib/tservers.py')
| -rw-r--r-- | test/netlib/tservers.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/netlib/tservers.py b/test/netlib/tservers.py index a80dcb28..10a6f70a 100644 --- a/test/netlib/tservers.py +++ b/test/netlib/tservers.py @@ -1,8 +1,8 @@ from __future__ import (absolute_import, print_function, division) import threading -from six.moves import queue -from io import StringIO +import queue +import io import OpenSSL from netlib import tcp @@ -80,7 +80,7 @@ class _TServer(tcp.TCPServer): h.finish() def handle_error(self, connection, client_address, fp=None): - s = StringIO() + s = io.StringIO() tcp.TCPServer.handle_error(self, connection, client_address, s) self.q.put(s.getvalue()) |