diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:19:52 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-09-16 20:19:52 +0200 |
| commit | e1659f3fcf83b5993b776a4ef3d2de70fbe27aa2 (patch) | |
| tree | c0eba50b522d1d0183b057e9cae7bf7cc38c4fc3 /netlib/tcp.py | |
| parent | 2f9c566e480c377566a0ae044d698a75b45cd54c (diff) | |
| parent | 265f31e8782ee9da511ce4b63aa2da00221cbf66 (diff) | |
| download | mitmproxy-e1659f3fcf83b5993b776a4ef3d2de70fbe27aa2.tar.gz mitmproxy-e1659f3fcf83b5993b776a4ef3d2de70fbe27aa2.tar.bz2 mitmproxy-e1659f3fcf83b5993b776a4ef3d2de70fbe27aa2.zip | |
Merge pull request #92 from mitmproxy/python3
Python3 & HTTP1 Refactor
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 8 |
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 """ |