aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/log.py
diff options
context:
space:
mode:
authorJason <jason.daurus@gmail.com>2016-05-28 01:11:04 +0800
committerJason <jason.daurus@gmail.com>2016-05-28 01:11:04 +0800
commit9e869f0aa17cbd202f72bab1540d866f7274a8a1 (patch)
tree765b55027aba7685264e838d285c0587d18b9205 /pathod/log.py
parentfb639c2e11225531172fb7b452250b58295a5a58 (diff)
parent22ecd022a84e1c3762dd425bc9bee2230e393d8d (diff)
downloadmitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.gz
mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.bz2
mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.zip
Merge remote-tracking branch 'origin/master' into contentview
Diffstat (limited to 'pathod/log.py')
-rw-r--r--pathod/log.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/pathod/log.py b/pathod/log.py
index f203542f..3f6aaea0 100644
--- a/pathod/log.py
+++ b/pathod/log.py
@@ -1,5 +1,7 @@
import datetime
+import six
+
import netlib.utils
import netlib.tcp
import netlib.http
@@ -53,7 +55,7 @@ class LogCtx(object):
]
)
if exc_value:
- raise exc_type, exc_value, traceback
+ six.reraise(exc_type, exc_value, traceback)
def suppress(self):
self.suppressed = True