diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-10-17 17:03:02 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 17:03:02 +1300 |
| commit | ae3ff8ee1edc646e7a640219df1a312c27f7c339 (patch) | |
| tree | 490697113ceaf12cc704c418357139e60a0190f3 /mitmproxy/platform/windows.py | |
| parent | 3fbce7e981cab5d20b3ef17a50f14b34e8c60fa3 (diff) | |
| parent | ce98a9219e060b729d4b0d2dc28bf4510649f0fd (diff) | |
| download | mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.gz mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.tar.bz2 mitmproxy-ae3ff8ee1edc646e7a640219df1a312c27f7c339.zip | |
Merge pull request #1615 from cortesi/python3a
exterminate six
Diffstat (limited to 'mitmproxy/platform/windows.py')
| -rw-r--r-- | mitmproxy/platform/windows.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/platform/windows.py b/mitmproxy/platform/windows.py index 576516e2..54d29c72 100644 --- a/mitmproxy/platform/windows.py +++ b/mitmproxy/platform/windows.py @@ -10,8 +10,8 @@ import time import configargparse from pydivert import enum from pydivert import windivert -from six.moves import cPickle as pickle -from six.moves import socketserver +import pickle +import socketserver PROXY_API_PORT = 8085 |