Merge pull request #233 from mitmproxy/untangle_circular_dependencies

Untangle circular dependencies

1 files changed, 3 insertions, 2 deletions

diff --git a/test/test_dump.py b/test/test_dump.py
index 8b4b9aa5..0f7d9bea 100644
--- a/test/test_dump.py
+++ b/test/test_dump.py
@@ -1,6 +1,7 @@
 import os
 from cStringIO import StringIO
 from libmproxy import dump, flow, proxy
+from libmproxy.proxy.primitives import Log
 import tutils
 import mock
 
@@ -21,13 +22,13 @@ def test_strfuncs():
 class TestDumpMaster:
     def _cycle(self, m, content):
         req = tutils.treq(content=content)
-        l = proxy.Log("connect")
+        l = Log("connect")
         l.reply = mock.MagicMock()
         m.handle_log(l)
         cc = req.flow.client_conn
         cc.reply = mock.MagicMock()
         m.handle_clientconnect(cc)
-        sc = proxy.ServerConnection((req.get_host(), req.get_port()), None)
+        sc = proxy.connection.ServerConnection((req.get_host(), req.get_port()), None)
         sc.reply = mock.MagicMock()
         m.handle_serverconnection(sc)
         m.handle_request(req)