aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-10-17 10:32:12 +0200
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-10-17 10:32:12 +0200
commit94c9dd66e6b09601840760dc35de079c851f3c3f (patch)
tree09c886e106f4c67695bd25fede056fe93d62f373 /mitmproxy
parente59a3be09d9f044572ce97a5f683707927fff863 (diff)
downloadmitmproxy-94c9dd66e6b09601840760dc35de079c851f3c3f.tar.gz
mitmproxy-94c9dd66e6b09601840760dc35de079c851f3c3f.tar.bz2
mitmproxy-94c9dd66e6b09601840760dc35de079c851f3c3f.zip
remove empty lines at beginning of file
Diffstat (limited to 'mitmproxy')
-rw-r--r--mitmproxy/builtins/__init__.py1
-rw-r--r--mitmproxy/builtins/anticache.py2
-rw-r--r--mitmproxy/builtins/anticomp.py2
-rw-r--r--mitmproxy/builtins/dumper.py1
-rw-r--r--mitmproxy/builtins/script.py1
-rw-r--r--mitmproxy/builtins/stickyauth.py1
-rw-r--r--mitmproxy/builtins/termlog.py1
-rw-r--r--mitmproxy/cmdline.py1
-rw-r--r--mitmproxy/console/flowdetailview.py1
-rw-r--r--mitmproxy/console/flowlist.py1
-rw-r--r--mitmproxy/console/flowview.py1
-rw-r--r--mitmproxy/console/grideditor/base.py1
-rw-r--r--mitmproxy/console/grideditor/col_bytes.py1
-rw-r--r--mitmproxy/console/help.py1
-rw-r--r--mitmproxy/console/master.py1
-rw-r--r--mitmproxy/console/options.py1
-rw-r--r--mitmproxy/console/palettepicker.py1
-rw-r--r--mitmproxy/console/pathedit.py1
-rw-r--r--mitmproxy/console/searchable.py1
-rw-r--r--mitmproxy/console/select.py1
-rw-r--r--mitmproxy/console/signals.py1
-rw-r--r--mitmproxy/console/statusbar.py1
-rw-r--r--mitmproxy/console/tabs.py1
-rw-r--r--mitmproxy/console/window.py1
-rw-r--r--mitmproxy/controller.py1
-rw-r--r--mitmproxy/dump.py1
-rw-r--r--mitmproxy/flow/__init__.py1
-rw-r--r--mitmproxy/flow/export.py1
-rw-r--r--mitmproxy/flow/io.py1
-rw-r--r--mitmproxy/flow/master.py1
-rw-r--r--mitmproxy/flow/modules.py1
-rw-r--r--mitmproxy/flow/state.py1
-rw-r--r--mitmproxy/main.py1
-rw-r--r--mitmproxy/models/__init__.py1
-rw-r--r--mitmproxy/models/flow.py1
-rw-r--r--mitmproxy/models/http.py1
-rw-r--r--mitmproxy/models/tcp.py1
-rw-r--r--mitmproxy/onboarding/app.py1
-rw-r--r--mitmproxy/options.py1
-rw-r--r--mitmproxy/optmanager.py1
-rw-r--r--mitmproxy/protocol/base.py1
-rw-r--r--mitmproxy/protocol/http.py1
-rw-r--r--mitmproxy/protocol/http1.py1
-rw-r--r--mitmproxy/protocol/http2.py1
-rw-r--r--mitmproxy/protocol/http_replay.py1
-rw-r--r--mitmproxy/protocol/rawtcp.py1
-rw-r--r--mitmproxy/protocol/tls.py1
-rw-r--r--mitmproxy/protocol/websockets.py1
-rw-r--r--mitmproxy/proxy/__init__.py1
-rw-r--r--mitmproxy/proxy/config.py1
-rw-r--r--mitmproxy/proxy/modes/__init__.py1
-rw-r--r--mitmproxy/proxy/modes/http_proxy.py1
-rw-r--r--mitmproxy/proxy/modes/reverse_proxy.py1
-rw-r--r--mitmproxy/proxy/modes/transparent_proxy.py1
-rw-r--r--mitmproxy/proxy/root_context.py1
-rw-r--r--mitmproxy/proxy/server.py1
-rw-r--r--mitmproxy/stateobject.py1
-rw-r--r--mitmproxy/utils.py1
-rw-r--r--mitmproxy/web/app.py1
-rw-r--r--mitmproxy/web/master.py1
60 files changed, 0 insertions, 62 deletions
diff --git a/mitmproxy/builtins/__init__.py b/mitmproxy/builtins/__init__.py
index 1071f2e7..4bd2e56d 100644
--- a/mitmproxy/builtins/__init__.py
+++ b/mitmproxy/builtins/__init__.py
@@ -1,4 +1,3 @@
-
from mitmproxy.builtins import anticache
from mitmproxy.builtins import anticomp
from mitmproxy.builtins import filestreamer
diff --git a/mitmproxy/builtins/anticache.py b/mitmproxy/builtins/anticache.py
index 05192f12..8d748a21 100644
--- a/mitmproxy/builtins/anticache.py
+++ b/mitmproxy/builtins/anticache.py
@@ -1,5 +1,3 @@
-
-
class AntiCache:
def __init__(self):
self.enabled = False
diff --git a/mitmproxy/builtins/anticomp.py b/mitmproxy/builtins/anticomp.py
index 9283d9c9..eaf01296 100644
--- a/mitmproxy/builtins/anticomp.py
+++ b/mitmproxy/builtins/anticomp.py
@@ -1,5 +1,3 @@
-
-
class AntiComp:
def __init__(self):
self.enabled = False
diff --git a/mitmproxy/builtins/dumper.py b/mitmproxy/builtins/dumper.py
index ddf84889..bba17f38 100644
--- a/mitmproxy/builtins/dumper.py
+++ b/mitmproxy/builtins/dumper.py
@@ -1,4 +1,3 @@
-
import itertools
import click
diff --git a/mitmproxy/builtins/script.py b/mitmproxy/builtins/script.py
index aef8e480..b409dff9 100644
--- a/mitmproxy/builtins/script.py
+++ b/mitmproxy/builtins/script.py
@@ -1,4 +1,3 @@
-
import contextlib
import os
import shlex
diff --git a/mitmproxy/builtins/stickyauth.py b/mitmproxy/builtins/stickyauth.py
index 540b717a..c0d7893d 100644
--- a/mitmproxy/builtins/stickyauth.py
+++ b/mitmproxy/builtins/stickyauth.py
@@ -1,4 +1,3 @@
-
from mitmproxy import exceptions
from mitmproxy import flowfilter
diff --git a/mitmproxy/builtins/termlog.py b/mitmproxy/builtins/termlog.py
index 3dbb869b..50c32044 100644
--- a/mitmproxy/builtins/termlog.py
+++ b/mitmproxy/builtins/termlog.py
@@ -1,4 +1,3 @@
-
import click
from mitmproxy import utils
diff --git a/mitmproxy/cmdline.py b/mitmproxy/cmdline.py
index 705aed74..df0b0a2f 100644
--- a/mitmproxy/cmdline.py
+++ b/mitmproxy/cmdline.py
@@ -1,4 +1,3 @@
-
import configargparse
import os
import re
diff --git a/mitmproxy/console/flowdetailview.py b/mitmproxy/console/flowdetailview.py
index 64fdd40b..5c0eaf79 100644
--- a/mitmproxy/console/flowdetailview.py
+++ b/mitmproxy/console/flowdetailview.py
@@ -1,4 +1,3 @@
-
import urwid
from mitmproxy.console import common, searchable
diff --git a/mitmproxy/console/flowlist.py b/mitmproxy/console/flowlist.py
index 70ce6cb6..ebba1ea4 100644
--- a/mitmproxy/console/flowlist.py
+++ b/mitmproxy/console/flowlist.py
@@ -1,4 +1,3 @@
-
import urwid
import netlib.http.url
diff --git a/mitmproxy/console/flowview.py b/mitmproxy/console/flowview.py
index 8e041405..4aa09bd9 100644
--- a/mitmproxy/console/flowview.py
+++ b/mitmproxy/console/flowview.py
@@ -1,4 +1,3 @@
-
import math
import os
import sys
diff --git a/mitmproxy/console/grideditor/base.py b/mitmproxy/console/grideditor/base.py
index 5825e50c..7b687c3e 100644
--- a/mitmproxy/console/grideditor/base.py
+++ b/mitmproxy/console/grideditor/base.py
@@ -1,4 +1,3 @@
-
import abc
import copy
from typing import Any
diff --git a/mitmproxy/console/grideditor/col_bytes.py b/mitmproxy/console/grideditor/col_bytes.py
index 51ce5a50..8956de88 100644
--- a/mitmproxy/console/grideditor/col_bytes.py
+++ b/mitmproxy/console/grideditor/col_bytes.py
@@ -1,4 +1,3 @@
-
import os
from typing import Callable, Optional
diff --git a/mitmproxy/console/help.py b/mitmproxy/console/help.py
index 06579206..5ee03f36 100644
--- a/mitmproxy/console/help.py
+++ b/mitmproxy/console/help.py
@@ -1,4 +1,3 @@
-
import platform
import urwid
diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py
index 5f31cb74..148f23bc 100644
--- a/mitmproxy/console/master.py
+++ b/mitmproxy/console/master.py
@@ -1,4 +1,3 @@
-
import mailcap
import mimetypes
import os
diff --git a/mitmproxy/console/options.py b/mitmproxy/console/options.py
index c4d9d872..d0f64713 100644
--- a/mitmproxy/console/options.py
+++ b/mitmproxy/console/options.py
@@ -1,4 +1,3 @@
-
import urwid
from mitmproxy import contentviews
diff --git a/mitmproxy/console/palettepicker.py b/mitmproxy/console/palettepicker.py
index 2bcb7387..b0840d8b 100644
--- a/mitmproxy/console/palettepicker.py
+++ b/mitmproxy/console/palettepicker.py
@@ -1,4 +1,3 @@
-
import urwid
from mitmproxy.console import common
diff --git a/mitmproxy/console/pathedit.py b/mitmproxy/console/pathedit.py
index 2255c679..4447070b 100644
--- a/mitmproxy/console/pathedit.py
+++ b/mitmproxy/console/pathedit.py
@@ -1,4 +1,3 @@
-
import glob
import os.path
diff --git a/mitmproxy/console/searchable.py b/mitmproxy/console/searchable.py
index 0fd6debc..f8766908 100644
--- a/mitmproxy/console/searchable.py
+++ b/mitmproxy/console/searchable.py
@@ -1,4 +1,3 @@
-
import urwid
from mitmproxy.console import signals
diff --git a/mitmproxy/console/select.py b/mitmproxy/console/select.py
index d5a3c42a..9f6a4cad 100644
--- a/mitmproxy/console/select.py
+++ b/mitmproxy/console/select.py
@@ -1,4 +1,3 @@
-
import urwid
from mitmproxy.console import common
diff --git a/mitmproxy/console/signals.py b/mitmproxy/console/signals.py
index b5d3111f..3cd8bc4b 100644
--- a/mitmproxy/console/signals.py
+++ b/mitmproxy/console/signals.py
@@ -1,4 +1,3 @@
-
import blinker
# Show a status message in the action bar
diff --git a/mitmproxy/console/statusbar.py b/mitmproxy/console/statusbar.py
index c43f68ad..e281af3b 100644
--- a/mitmproxy/console/statusbar.py
+++ b/mitmproxy/console/statusbar.py
@@ -1,4 +1,3 @@
-
import os.path
import urwid
diff --git a/mitmproxy/console/tabs.py b/mitmproxy/console/tabs.py
index e2c2f6b9..a2d5e719 100644
--- a/mitmproxy/console/tabs.py
+++ b/mitmproxy/console/tabs.py
@@ -1,4 +1,3 @@
-
import urwid
diff --git a/mitmproxy/console/window.py b/mitmproxy/console/window.py
index a3a94933..b972208e 100644
--- a/mitmproxy/console/window.py
+++ b/mitmproxy/console/window.py
@@ -1,4 +1,3 @@
-
import urwid
from mitmproxy.console import signals
diff --git a/mitmproxy/controller.py b/mitmproxy/controller.py
index 214dbd4c..148fda77 100644
--- a/mitmproxy/controller.py
+++ b/mitmproxy/controller.py
@@ -1,4 +1,3 @@
-
import functools
import threading
import contextlib
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index dfe5309b..35f6e1d3 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -1,4 +1,3 @@
-
import typing
from typing import Optional
diff --git a/mitmproxy/flow/__init__.py b/mitmproxy/flow/__init__.py
index f7e83e8a..9c1cb477 100644
--- a/mitmproxy/flow/__init__.py
+++ b/mitmproxy/flow/__init__.py
@@ -1,4 +1,3 @@
-
from mitmproxy.flow import export, modules
from mitmproxy.flow.io import FlowWriter, FilteredFlowWriter, FlowReader, read_flows_from_paths
from mitmproxy.flow.master import FlowMaster
diff --git a/mitmproxy/flow/export.py b/mitmproxy/flow/export.py
index a73bda5b..e5f4d34a 100644
--- a/mitmproxy/flow/export.py
+++ b/mitmproxy/flow/export.py
@@ -1,4 +1,3 @@
-
import json
import re
import textwrap
diff --git a/mitmproxy/flow/io.py b/mitmproxy/flow/io.py
index cc28998b..e2a6472c 100644
--- a/mitmproxy/flow/io.py
+++ b/mitmproxy/flow/io.py
@@ -1,4 +1,3 @@
-
import os
from mitmproxy import exceptions
diff --git a/mitmproxy/flow/master.py b/mitmproxy/flow/master.py
index c05eb9d1..14ba39e2 100644
--- a/mitmproxy/flow/master.py
+++ b/mitmproxy/flow/master.py
@@ -1,4 +1,3 @@
-
import os
import sys
diff --git a/mitmproxy/flow/modules.py b/mitmproxy/flow/modules.py
index c6fe3773..ec86ba9f 100644
--- a/mitmproxy/flow/modules.py
+++ b/mitmproxy/flow/modules.py
@@ -1,4 +1,3 @@
-
from netlib import wsgi
from netlib import version
from netlib.http import http1
diff --git a/mitmproxy/flow/state.py b/mitmproxy/flow/state.py
index 084b798d..cb01f6fe 100644
--- a/mitmproxy/flow/state.py
+++ b/mitmproxy/flow/state.py
@@ -1,4 +1,3 @@
-
from abc import abstractmethod, ABCMeta
from typing import List # noqa
diff --git a/mitmproxy/main.py b/mitmproxy/main.py
index 5a7fef2c..59832a6b 100644
--- a/mitmproxy/main.py
+++ b/mitmproxy/main.py
@@ -1,4 +1,3 @@
-
import os
import signal
import sys
diff --git a/mitmproxy/models/__init__.py b/mitmproxy/models/__init__.py
index 25319b2d..0dcc73a0 100644
--- a/mitmproxy/models/__init__.py
+++ b/mitmproxy/models/__init__.py
@@ -1,4 +1,3 @@
-
from netlib.http import decoded
from .connections import ClientConnection, ServerConnection
from .flow import Flow, Error
diff --git a/mitmproxy/models/flow.py b/mitmproxy/models/flow.py
index 2379b391..6d3fa0d5 100644
--- a/mitmproxy/models/flow.py
+++ b/mitmproxy/models/flow.py
@@ -1,4 +1,3 @@
-
import time
import copy
import uuid
diff --git a/mitmproxy/models/http.py b/mitmproxy/models/http.py
index e679205d..1d7f9eb8 100644
--- a/mitmproxy/models/http.py
+++ b/mitmproxy/models/http.py
@@ -1,4 +1,3 @@
-
import cgi
from mitmproxy.models import flow
diff --git a/mitmproxy/models/tcp.py b/mitmproxy/models/tcp.py
index 1be23d79..ae30730e 100644
--- a/mitmproxy/models/tcp.py
+++ b/mitmproxy/models/tcp.py
@@ -1,4 +1,3 @@
-
import time
from typing import List
diff --git a/mitmproxy/onboarding/app.py b/mitmproxy/onboarding/app.py
index b4ec4c84..11754b9a 100644
--- a/mitmproxy/onboarding/app.py
+++ b/mitmproxy/onboarding/app.py
@@ -1,4 +1,3 @@
-
import os
import tornado.template
diff --git a/mitmproxy/options.py b/mitmproxy/options.py
index c98b3aea..26b7030e 100644
--- a/mitmproxy/options.py
+++ b/mitmproxy/options.py
@@ -1,4 +1,3 @@
-
from typing import Tuple, Optional, Sequence
from mitmproxy import optmanager
diff --git a/mitmproxy/optmanager.py b/mitmproxy/optmanager.py
index 45e02c60..6683e41d 100644
--- a/mitmproxy/optmanager.py
+++ b/mitmproxy/optmanager.py
@@ -1,4 +1,3 @@
-
import contextlib
import blinker
import pprint
diff --git a/mitmproxy/protocol/base.py b/mitmproxy/protocol/base.py
index 4c824179..d280b69c 100644
--- a/mitmproxy/protocol/base.py
+++ b/mitmproxy/protocol/base.py
@@ -1,4 +1,3 @@
-
import netlib.exceptions
from mitmproxy import exceptions
from mitmproxy import models
diff --git a/mitmproxy/protocol/http.py b/mitmproxy/protocol/http.py
index 7f00933e..b9abfb4c 100644
--- a/mitmproxy/protocol/http.py
+++ b/mitmproxy/protocol/http.py
@@ -1,4 +1,3 @@
-
import h2.exceptions
import netlib.exceptions
import time
diff --git a/mitmproxy/protocol/http1.py b/mitmproxy/protocol/http1.py
index a74e5d62..46839c58 100644
--- a/mitmproxy/protocol/http1.py
+++ b/mitmproxy/protocol/http1.py
@@ -1,4 +1,3 @@
-
from mitmproxy import models
from mitmproxy.protocol import http
from netlib.http import http1
diff --git a/mitmproxy/protocol/http2.py b/mitmproxy/protocol/http2.py
index 756acc9f..04d2b608 100644
--- a/mitmproxy/protocol/http2.py
+++ b/mitmproxy/protocol/http2.py
@@ -1,4 +1,3 @@
-
import threading
import time
import traceback
diff --git a/mitmproxy/protocol/http_replay.py b/mitmproxy/protocol/http_replay.py
index 9f23832d..6f9340b5 100644
--- a/mitmproxy/protocol/http_replay.py
+++ b/mitmproxy/protocol/http_replay.py
@@ -1,4 +1,3 @@
-
import traceback
import netlib.exceptions
diff --git a/mitmproxy/protocol/rawtcp.py b/mitmproxy/protocol/rawtcp.py
index ecbe80c9..de9f3c24 100644
--- a/mitmproxy/protocol/rawtcp.py
+++ b/mitmproxy/protocol/rawtcp.py
@@ -1,4 +1,3 @@
-
import socket
from OpenSSL import SSL
diff --git a/mitmproxy/protocol/tls.py b/mitmproxy/protocol/tls.py
index bd650ef4..265e9086 100644
--- a/mitmproxy/protocol/tls.py
+++ b/mitmproxy/protocol/tls.py
@@ -1,4 +1,3 @@
-
import struct
from typing import Optional # noqa
from typing import Union
diff --git a/mitmproxy/protocol/websockets.py b/mitmproxy/protocol/websockets.py
index 73f0a37d..23b21d22 100644
--- a/mitmproxy/protocol/websockets.py
+++ b/mitmproxy/protocol/websockets.py
@@ -1,4 +1,3 @@
-
import netlib.exceptions
import socket
import struct
diff --git a/mitmproxy/proxy/__init__.py b/mitmproxy/proxy/__init__.py
index f48c3d61..a28ac58b 100644
--- a/mitmproxy/proxy/__init__.py
+++ b/mitmproxy/proxy/__init__.py
@@ -1,4 +1,3 @@
-
from .config import ProxyConfig
from .root_context import RootContext
from .server import ProxyServer, DummyServer
diff --git a/mitmproxy/proxy/config.py b/mitmproxy/proxy/config.py
index f92e3b63..201dfdf7 100644
--- a/mitmproxy/proxy/config.py
+++ b/mitmproxy/proxy/config.py
@@ -1,4 +1,3 @@
-
import base64
import collections
import os
diff --git a/mitmproxy/proxy/modes/__init__.py b/mitmproxy/proxy/modes/__init__.py
index ebe23b8c..a25e9b36 100644
--- a/mitmproxy/proxy/modes/__init__.py
+++ b/mitmproxy/proxy/modes/__init__.py
@@ -1,4 +1,3 @@
-
from .http_proxy import HttpProxy, HttpUpstreamProxy
from .reverse_proxy import ReverseProxy
from .socks_proxy import Socks5Proxy
diff --git a/mitmproxy/proxy/modes/http_proxy.py b/mitmproxy/proxy/modes/http_proxy.py
index 4ec3b578..37e7f04f 100644
--- a/mitmproxy/proxy/modes/http_proxy.py
+++ b/mitmproxy/proxy/modes/http_proxy.py
@@ -1,4 +1,3 @@
-
from mitmproxy import protocol
diff --git a/mitmproxy/proxy/modes/reverse_proxy.py b/mitmproxy/proxy/modes/reverse_proxy.py
index 1a6f7d3d..453b7d05 100644
--- a/mitmproxy/proxy/modes/reverse_proxy.py
+++ b/mitmproxy/proxy/modes/reverse_proxy.py
@@ -1,4 +1,3 @@
-
from mitmproxy import protocol
diff --git a/mitmproxy/proxy/modes/transparent_proxy.py b/mitmproxy/proxy/modes/transparent_proxy.py
index c29e7b06..2fb19b44 100644
--- a/mitmproxy/proxy/modes/transparent_proxy.py
+++ b/mitmproxy/proxy/modes/transparent_proxy.py
@@ -1,4 +1,3 @@
-
from mitmproxy import exceptions
from mitmproxy import platform
from mitmproxy import protocol
diff --git a/mitmproxy/proxy/root_context.py b/mitmproxy/proxy/root_context.py
index 4bfe87b2..ef6aaf36 100644
--- a/mitmproxy/proxy/root_context.py
+++ b/mitmproxy/proxy/root_context.py
@@ -1,4 +1,3 @@
-
import netlib.exceptions
from mitmproxy import controller
from mitmproxy import exceptions
diff --git a/mitmproxy/proxy/server.py b/mitmproxy/proxy/server.py
index d1ec4e0a..5f2a00dd 100644
--- a/mitmproxy/proxy/server.py
+++ b/mitmproxy/proxy/server.py
@@ -1,4 +1,3 @@
-
import socket
import sys
import traceback
diff --git a/mitmproxy/stateobject.py b/mitmproxy/stateobject.py
index 1ed8675a..f4415ecf 100644
--- a/mitmproxy/stateobject.py
+++ b/mitmproxy/stateobject.py
@@ -1,4 +1,3 @@
-
from typing import Any
from typing import List
diff --git a/mitmproxy/utils.py b/mitmproxy/utils.py
index 034f57d8..fb2effd8 100644
--- a/mitmproxy/utils.py
+++ b/mitmproxy/utils.py
@@ -1,4 +1,3 @@
-
import netlib.utils
diff --git a/mitmproxy/web/app.py b/mitmproxy/web/app.py
index 0d573ec7..1aab8e8c 100644
--- a/mitmproxy/web/app.py
+++ b/mitmproxy/web/app.py
@@ -1,4 +1,3 @@
-
import base64
import json
import logging
diff --git a/mitmproxy/web/master.py b/mitmproxy/web/master.py
index 0a237532..23c95e57 100644
--- a/mitmproxy/web/master.py
+++ b/mitmproxy/web/master.py
@@ -1,4 +1,3 @@
-
import sys
import collections