aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/pathod.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-10-17 17:03:02 +1300
committerGitHub <noreply@github.com>2016-10-17 17:03:02 +1300
commitae3ff8ee1edc646e7a640219df1a312c27f7c339 (patch)
tree490697113ceaf12cc704c418357139e60a0190f3 /pathod/pathod.py
parent3fbce7e981cab5d20b3ef17a50f14b34e8c60fa3 (diff)
parentce98a9219e060b729d4b0d2dc28bf4510649f0fd (diff)
downloadmitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.gz
mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.bz2
mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.zip
Merge pull request #1615 from cortesi/python3a
exterminate six
Diffstat (limited to 'pathod/pathod.py')
-rw-r--r--pathod/pathod.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pathod/pathod.py b/pathod/pathod.py
index 4f6c3d38..e882b73e 100644
--- a/pathod/pathod.py
+++ b/pathod/pathod.py
@@ -10,7 +10,7 @@ from netlib import certutils
from netlib import websockets
from netlib import version
-from six.moves import urllib
+import urllib
from netlib.exceptions import HttpException, HttpReadDisconnect, TcpTimeout, TcpDisconnect, \
TlsException