5 files changed, 30 insertions, 17 deletions
diff --git a/mitmproxy/models/__init__.py b/mitmproxy/models/__init__.py
index 3d9d9dae..ca813567 100644
--- a/mitmproxy/models/__init__.py
+++ b/mitmproxy/models/__init__.py
@@ -1,12 +1,12 @@
-from __future__ import (absolute_import, print_function, division)
+from __future__ import absolute_import, print_function, division
 
+from netlib.http import decoded
+from .connections import ClientConnection, ServerConnection
+from .flow import Flow, Error
 from .http import (
     HTTPFlow, HTTPRequest, HTTPResponse, Headers,
     make_error_response, make_connect_request, make_connect_response, expect_continue_response
 )
-from netlib.http import decoded
-from .connections import ClientConnection, ServerConnection
-from .flow import Flow, Error
 from .tcp import TCPFlow
 
 FLOW_TYPES = dict(
diff --git a/mitmproxy/models/connections.py b/mitmproxy/models/connections.py
index 24cdff74..6347f488 100644
--- a/mitmproxy/models/connections.py
+++ b/mitmproxy/models/connections.py
@@ -1,12 +1,14 @@
-from __future__ import (absolute_import, print_function, division)
+from __future__ import absolute_import, print_function, division
 
 import copy
 import os
 
 import six
 
-from netlib import tcp, certutils
-from .. import stateobject, utils
+from mitmproxy import stateobject
+from mitmproxy import utils
+from netlib import certutils
+from netlib import tcp
 
 
 class ClientConnection(tcp.BaseHandler, stateobject.StateObject):
diff --git a/mitmproxy/models/flow.py b/mitmproxy/models/flow.py
index 8797fcd8..7b9ec030 100644
--- a/mitmproxy/models/flow.py
+++ b/mitmproxy/models/flow.py
@@ -1,10 +1,14 @@
-from __future__ import (absolute_import, print_function, division)
+from __future__ import absolute_import, print_function, division
+
 import copy
 import uuid
 
-from .. import stateobject, utils, version
-from .connections import ClientConnection, ServerConnection
-from ..exceptions import Kill
+from mitmproxy import exceptions
+from mitmproxy import stateobject
+from mitmproxy import utils
+from mitmproxy import version
+from mitmproxy.models.connections import ClientConnection
+from mitmproxy.models.connections import ServerConnection
 
 
 class Error(stateobject.StateObject):
@@ -151,7 +155,7 @@ class Flow(stateobject.StateObject):
         """
         self.error = Error("Connection killed")
         self.intercepted = False
-        self.reply(Kill)
+        self.reply(exceptions.Kill)
         master.error(self)
 
     def intercept(self, master):
diff --git a/mitmproxy/models/http.py b/mitmproxy/models/http.py
index 43618ef8..a32124ac 100644
--- a/mitmproxy/models/http.py
+++ b/mitmproxy/models/http.py
@@ -1,11 +1,15 @@
-from __future__ import (absolute_import, print_function, division)
+from __future__ import absolute_import, print_function, division
+
 import cgi
 
+from mitmproxy import version
+from mitmproxy.models.flow import Flow
 from netlib import encoding
-from netlib.http import status_codes, Headers, Request, Response
+from netlib.http import Headers
+from netlib.http import Request
+from netlib.http import Response
+from netlib.http import status_codes
 from netlib.tcp import Address
-from .. import version
-from .flow import Flow
 
 
 class MessageMixin(object):
diff --git a/mitmproxy/models/tcp.py b/mitmproxy/models/tcp.py
index c7cfb9f8..e33475c2 100644
--- a/mitmproxy/models/tcp.py
+++ b/mitmproxy/models/tcp.py
@@ -1,8 +1,11 @@
+from __future__ import absolute_import, print_function, division
+
 import time
+
 from typing import List
 
 import netlib.basetypes
-from .flow import Flow
+from mitmproxy.models.flow import Flow
 
 
 class TCPMessage(netlib.basetypes.Serializable):