diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-09-07 12:39:59 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-09-07 12:39:59 +1200 |
| commit | f98989b075fb2669f342a51389fa5db1bc21a059 (patch) | |
| tree | 6fdc6a22b5833f44dc55f187f79b39f17b35ea4e /netlib/tcp.py | |
| parent | c2e74ef95c09216b0ee69987796e80ba01f75dab (diff) | |
| parent | b688661ffbdfd269fa7b4aa97d0746abe85bb073 (diff) | |
| download | mitmproxy-f98989b075fb2669f342a51389fa5db1bc21a059.tar.gz mitmproxy-f98989b075fb2669f342a51389fa5db1bc21a059.tar.bz2 mitmproxy-f98989b075fb2669f342a51389fa5db1bc21a059.zip | |
Merge branch 'master' into mitmproxy_issue_341
Conflicts:
netlib/tcp.py
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index ede8682b..2704eeae 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -494,10 +494,13 @@ class TCPServer(object): # none. if traceback: exc = traceback.format_exc() - print('-' * 40, file=fp) - print("Error in processing of request from %s:%s" % (client_address.host, client_address.port), file=fp) + print('-'*40, file=fp) + print( + "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('-'*40, file=fp) def handle_client_connection(self, conn, client_address): # pragma: no cover """ |