diff options
author | Jason <jason.daurus@gmail.com> | 2016-05-28 01:11:04 +0800 |
---|---|---|
committer | Jason <jason.daurus@gmail.com> | 2016-05-28 01:11:04 +0800 |
commit | 9e869f0aa17cbd202f72bab1540d866f7274a8a1 (patch) | |
tree | 765b55027aba7685264e838d285c0587d18b9205 /pathod/pathod.py | |
parent | fb639c2e11225531172fb7b452250b58295a5a58 (diff) | |
parent | 22ecd022a84e1c3762dd425bc9bee2230e393d8d (diff) | |
download | mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.gz mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.tar.bz2 mitmproxy-9e869f0aa17cbd202f72bab1540d866f7274a8a1.zip |
Merge remote-tracking branch 'origin/master' into contentview
Diffstat (limited to 'pathod/pathod.py')
-rw-r--r-- | pathod/pathod.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pathod/pathod.py b/pathod/pathod.py index 017ce072..af5f9e6a 100644 --- a/pathod/pathod.py +++ b/pathod/pathod.py @@ -6,15 +6,11 @@ import sys import threading import urllib -from netlib import tcp, http, certutils, websockets +from netlib import tcp, certutils, websockets from netlib.exceptions import HttpException, HttpReadDisconnect, TcpTimeout, TcpDisconnect, \ TlsException from . import version, app, language, utils, log, protocols -import language.http -import language.actions -import language.exceptions -import language.websockets DEFAULT_CERT_DOMAIN = "pathod.net" |