diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-08-11 10:57:32 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-11 10:57:32 +0200 |
| commit | f3a611339148a5a3de141ff1234ec9018ab20896 (patch) | |
| tree | 5c53dc5d5eb8a06d1caaed84b04fd137cdbee6a1 /netlib/websockets/frame.py | |
| parent | c2832ef72bd4eed485a1c8d4bcb732da69896444 (diff) | |
| parent | 6a30ad2ad236fa20d086e271ff962ebc907da027 (diff) | |
| download | mitmproxy-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/frame.py')
| -rw-r--r-- | netlib/websockets/frame.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/netlib/websockets/frame.py b/netlib/websockets/frame.py index 49d8ee10..1c4a03b2 100644 --- a/netlib/websockets/frame.py +++ b/netlib/websockets/frame.py @@ -1,12 +1,11 @@ from __future__ import absolute_import -import base64 -import hashlib import os import struct import io from .protocol import Masker -from netlib import utils, odict, tcp +from netlib import tcp +from netlib import utils DEFAULT = object() @@ -22,6 +21,7 @@ OPCODE = utils.BiDi( PONG=0x0a ) + class FrameHeader(object): def __init__( |