aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tcp.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-15 19:12:15 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-15 19:12:15 +0200
commit11e7f476bd4bbcd6d072fa3659f628ae3a19705d (patch)
tree7fe3f67bcf41af6c573e312ef4e6adfa18f9f870 /netlib/tcp.py
parent2f9c566e480c377566a0ae044d698a75b45cd54c (diff)
downloadmitmproxy-11e7f476bd4bbcd6d072fa3659f628ae3a19705d.tar.gz
mitmproxy-11e7f476bd4bbcd6d072fa3659f628ae3a19705d.tar.bz2
mitmproxy-11e7f476bd4bbcd6d072fa3659f628ae3a19705d.zip
wip
Diffstat (limited to 'netlib/tcp.py')
-rw-r--r--netlib/tcp.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py
index 4a7f6153..1eb417b4 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -834,14 +834,14 @@ class TCPServer(object):
# If a thread has persisted after interpreter exit, the module might be
# none.
if traceback:
- exc = traceback.format_exc()
- print('-' * 40, file=fp)
+ exc = six.text_type(traceback.format_exc())
+ print(u'-' * 40, file=fp)
print(
- "Error in processing of request from %s:%s" % (
+ u"Error in processing of request from %s:%s" % (
client_address.host, client_address.port
), file=fp)
print(exc, file=fp)
- print('-' * 40, file=fp)
+ print(u'-' * 40, file=fp)
def handle_client_connection(self, conn, client_address): # pragma: no cover
"""