aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/pathoc.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2016-05-26 12:09:39 -0700
committerMaximilian Hils <git@maximilianhils.com>2016-05-26 12:09:39 -0700
commit22ecd022a84e1c3762dd425bc9bee2230e393d8d (patch)
tree47f7cac0e86c715bc32e955072fbe59f06d589cf /pathod/pathoc.py
parentd149c447fe9d3ec359271270ed1c32c2c7da6aad (diff)
parent92317bc81d72f243095a1bfa192f568637d9bc32 (diff)
downloadmitmproxy-22ecd022a84e1c3762dd425bc9bee2230e393d8d.tar.gz
mitmproxy-22ecd022a84e1c3762dd425bc9bee2230e393d8d.tar.bz2
mitmproxy-22ecd022a84e1c3762dd425bc9bee2230e393d8d.zip
Merge pull request #1119 from dufferzafar/pathod-port
Python 3 - pathod.utils
Diffstat (limited to 'pathod/pathoc.py')
-rw-r--r--pathod/pathoc.py6
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