aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2015-08-10 20:36:47 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2015-08-10 20:36:47 +0200
commit476badf45cd085d69b6162cd48983e3cd22cefcc (patch)
tree0c7a52c4ae0d27b52bce0f93a8e244ed06dd91a1 /netlib
parent690b8b4f4e00d60b373b5a1481930f21bbc5054a (diff)
downloadmitmproxy-476badf45cd085d69b6162cd48983e3cd22cefcc.tar.gz
mitmproxy-476badf45cd085d69b6162cd48983e3cd22cefcc.tar.bz2
mitmproxy-476badf45cd085d69b6162cd48983e3cd22cefcc.zip
cleanup imports
Diffstat (limited to 'netlib')
-rw-r--r--netlib/http/authentication.py2
-rw-r--r--netlib/http/http1/protocol.py4
-rw-r--r--netlib/http/semantics.py4
-rw-r--r--netlib/websockets/frame.py5
-rw-r--r--netlib/websockets/protocol.py5
5 files changed, 4 insertions, 16 deletions
diff --git a/netlib/http/authentication.py b/netlib/http/authentication.py
index 9a227010..29b9eb3c 100644
--- a/netlib/http/authentication.py
+++ b/netlib/http/authentication.py
@@ -2,7 +2,6 @@ from __future__ import (absolute_import, print_function, division)
from argparse import Action, ArgumentTypeError
import binascii
-from .. import http
def parse_http_basic_auth(s):
words = s.split()
@@ -37,7 +36,6 @@ class NullProxyAuth(object):
"""
Clean up authentication headers, so they're not passed upstream.
"""
- pass
def authenticate(self, headers_):
"""
diff --git a/netlib/http/http1/protocol.py b/netlib/http/http1/protocol.py
index 31e9cc85..c797e930 100644
--- a/netlib/http/http1/protocol.py
+++ b/netlib/http/http1/protocol.py
@@ -1,14 +1,10 @@
from __future__ import (absolute_import, print_function, division)
-import binascii
-import collections
import string
import sys
-import urlparse
import time
from netlib import odict, utils, tcp, http
from netlib.http import semantics
-from .. import status_codes
from ..exceptions import *
class TCPHandler(object):
diff --git a/netlib/http/semantics.py b/netlib/http/semantics.py
index 974fe6e6..15add957 100644
--- a/netlib/http/semantics.py
+++ b/netlib/http/semantics.py
@@ -1,8 +1,4 @@
from __future__ import (absolute_import, print_function, division)
-import binascii
-import collections
-import string
-import sys
import urllib
import urlparse
diff --git a/netlib/websockets/frame.py b/netlib/websockets/frame.py
index 49d8ee10..ad4ad0ee 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()
diff --git a/netlib/websockets/protocol.py b/netlib/websockets/protocol.py
index 29b4db3d..8169309a 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.