aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-05-26 12:31:29 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-05-28 11:00:00 +1200
commit7c4843857be0ad165fca46dcad24a213fc3bd284 (patch)
tree4a4ae7df627ca9700c2f1fab8b3a9f77c085a2ec /netlib
parentabf3cae54e715e53559b4c7103f8b2247ed791dc (diff)
downloadmitmproxy-7c4843857be0ad165fca46dcad24a213fc3bd284.tar.gz
mitmproxy-7c4843857be0ad165fca46dcad24a213fc3bd284.tar.bz2
mitmproxy-7c4843857be0ad165fca46dcad24a213fc3bd284.zip
Sketch out a more solid core
- Decorator for handler methods - Stricter checking for double-acks and non-acks
Diffstat (limited to 'netlib')
-rw-r--r--netlib/tcp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py
index d26bb5f7..8e3ae65e 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -900,7 +900,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(