aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/websockets/protocol.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-08-11 10:57:32 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-08-11 10:57:32 +0200
commitf3a611339148a5a3de141ff1234ec9018ab20896 (patch)
tree5c53dc5d5eb8a06d1caaed84b04fd137cdbee6a1 /netlib/websockets/protocol.py
parentc2832ef72bd4eed485a1c8d4bcb732da69896444 (diff)
parent6a30ad2ad236fa20d086e271ff962ebc907da027 (diff)
downloadmitmproxy-f3a611339148a5a3de141ff1234ec9018ab20896.tar.gz
mitmproxy-f3a611339148a5a3de141ff1234ec9018ab20896.tar.bz2
mitmproxy-f3a611339148a5a3de141ff1234ec9018ab20896.zip
Merge pull request #85 from Kriechi/http2-wip
add move tests and code from mitmproxy
Diffstat (limited to 'netlib/websockets/protocol.py')
-rw-r--r--netlib/websockets/protocol.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/netlib/websockets/protocol.py b/netlib/websockets/protocol.py
index 29b4db3d..6ce32eac 100644
--- a/netlib/websockets/protocol.py
+++ b/netlib/websockets/protocol.py
@@ -2,10 +2,9 @@ from __future__ import absolute_import
import base64
import hashlib
import os
-import struct
-import io
-from netlib import utils, odict, tcp
+from netlib import odict
+from netlib import utils
# Colleciton of utility functions that implement small portions of the RFC6455
# WebSockets Protocol Useful for building WebSocket clients and servers.
@@ -26,6 +25,7 @@ HEADER_WEBSOCKET_KEY = 'sec-websocket-key'
HEADER_WEBSOCKET_ACCEPT = 'sec-websocket-accept'
HEADER_WEBSOCKET_VERSION = 'sec-websocket-version'
+
class Masker(object):
"""
@@ -53,6 +53,7 @@ class Masker(object):
self.offset += len(ret)
return ret
+
class WebsocketsProtocol(object):
def __init__(self):