aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/websockets
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-10-20 10:11:58 +1300
committerAldo Cortesi <aldo@nullcube.com>2016-10-20 10:11:58 +1300
commitf45f4e677e8cddba8160d1e4e02ca8a4515e3456 (patch)
treea48ce5978fa24b2e92d770b1263fd3952055d9d7 /netlib/websockets
parent1407830280383e50a8af848a0c564c4912df5a52 (diff)
downloadmitmproxy-f45f4e677e8cddba8160d1e4e02ca8a4515e3456.tar.gz
mitmproxy-f45f4e677e8cddba8160d1e4e02ca8a4515e3456.tar.bz2
mitmproxy-f45f4e677e8cddba8160d1e4e02ca8a4515e3456.zip
netlib.strutils -> mitmproxy.utils.strutils
Diffstat (limited to 'netlib/websockets')
-rw-r--r--netlib/websockets/frame.py2
-rw-r--r--netlib/websockets/utils.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/netlib/websockets/frame.py b/netlib/websockets/frame.py
index 02d74112..e022a95c 100644
--- a/netlib/websockets/frame.py
+++ b/netlib/websockets/frame.py
@@ -3,7 +3,7 @@ import struct
import io
from netlib import tcp
-from netlib import strutils
+from mitmproxy.utils import strutils
from netlib import utils
from mitmproxy.utils import human
from .masker import Masker
diff --git a/netlib/websockets/utils.py b/netlib/websockets/utils.py
index fdec074e..98043662 100644
--- a/netlib/websockets/utils.py
+++ b/netlib/websockets/utils.py
@@ -8,7 +8,8 @@ import base64
import hashlib
import os
-from netlib import http, strutils
+from netlib import http
+from mitmproxy.utils import strutils
MAGIC = b'258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
VERSION = "13"