diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-05-29 20:03:40 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2016-05-29 20:03:40 +1200 |
| commit | f3bee6f24539005e0916e786805e1655bb7f80f8 (patch) | |
| tree | efa23c05738aae1aeb396b10fd012151d66d555c /netlib/tcp.py | |
| parent | 85aa5da6e3b7d811d316ed692ecd40e5442abe02 (diff) | |
| parent | 0176f50e4f4994be4b19be212f3a3db053a18d0c (diff) | |
| download | mitmproxy-f3bee6f24539005e0916e786805e1655bb7f80f8.tar.gz mitmproxy-f3bee6f24539005e0916e786805e1655bb7f80f8.tar.bz2 mitmproxy-f3bee6f24539005e0916e786805e1655bb7f80f8.zip | |
Merge pull request #1172 from cortesi/solidcore
First steps to solidifying the core
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index ad75cff8..c7231dbb 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -901,7 +901,7 @@ class TCPServer(object): """ # If a thread has persisted after interpreter exit, the module might be # none. - if traceback: + if traceback and six: exc = six.text_type(traceback.format_exc()) print(u'-' * 40, file=fp) print( |