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/pathoc.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/pathoc.py')
| -rw-r--r-- | pathod/pathoc.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pathod/pathoc.py b/pathod/pathoc.py index a49ed351..8706868b 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -13,14 +13,12 @@ import threading import OpenSSL.crypto import six -from netlib import tcp, http, certutils, websockets, socks +from netlib import tcp, certutils, websockets, socks from netlib.exceptions import HttpException, TcpDisconnect, TcpTimeout, TlsException, TcpException, \ NetlibException from netlib.http import http1, http2 -import language.http -import language.websockets -from . import utils, log +from . import utils, log, language import logging from netlib.tutils import treq |