finish proxy.py split up

7 files changed, 28 insertions, 24 deletions

diff --git a/test/test_dump.py b/test/test_dump.py
index c5c231fa..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, prxy
+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 = prxy.connection.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)
diff --git a/test/test_flow.py b/test/test_flow.py
index c7e39f73..2365c08c 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -1,10 +1,10 @@
 import Queue, time, os.path
 from cStringIO import StringIO
 import email.utils
-from libmproxy import filt, protocol, controller, utils, tnetstring, proxy, flow
+from libmproxy import filt, protocol, controller, utils, tnetstring, flow
 from libmproxy.protocol.primitives import Error, Flow
-from libmproxy.protocol.http import decoded
-from libmproxy.prxy.connection import ClientConnection, ServerConnection
+from libmproxy.protocol.http import decoded, CONTENT_MISSING
+from libmproxy.proxy.connection import ClientConnection, ServerConnection
 from netlib import tcp
 import tutils
 
@@ -566,7 +566,7 @@ class TestFlowMaster:
         s = flow.State()
         fm = flow.FlowMaster(None, s)
         f = tutils.tflow_full()
-        f.request.content = flow.CONTENT_MISSING
+        f.request.content = CONTENT_MISSING
         assert "missing" in fm.replay_request(f)
 
         f.intercepting = True
@@ -796,7 +796,7 @@ class TestRequest:
         assert r._assemble()
         assert r.size() == len(r._assemble())
 
-        r.content = flow.CONTENT_MISSING
+        r.content = CONTENT_MISSING
         tutils.raises("Cannot assemble flow with CONTENT_MISSING", r._assemble)
 
     def test_get_url(self):
@@ -1004,7 +1004,7 @@ class TestResponse:
         assert resp._assemble()
         assert resp.size() == len(resp._assemble())
 
-        resp.content = flow.CONTENT_MISSING
+        resp.content = CONTENT_MISSING
         tutils.raises("Cannot assemble flow with CONTENT_MISSING", resp._assemble)
 
     def test_refresh(self):
diff --git a/test/test_protocol_http.py b/test/test_protocol_http.py
index 3f37928c..6ff0cb65 100644
--- a/test/test_protocol_http.py
+++ b/test/test_protocol_http.py
@@ -1,4 +1,3 @@
-from libmproxy import proxy  # FIXME: Remove
 from libmproxy.protocol.http import *
 from libmproxy.protocol import KILL
 from cStringIO import StringIO
diff --git a/test/test_proxy.py b/test/test_proxy.py
index 2a4a250e..f53aa762 100644
--- a/test/test_proxy.py
+++ b/test/test_proxy.py
@@ -1,7 +1,9 @@
 import argparse
-from libmproxy import proxy, flow, cmdline
-from libmproxy.prxy.connection import ServerConnection
-from libmproxy.prxy.exception import ProxyError
+from libmproxy import cmdline
+from libmproxy.proxy.config import process_proxy_options
+from libmproxy.proxy.connection import ServerConnection
+from libmproxy.proxy.primitives import ProxyError
+from libmproxy.proxy.server import DummyServer, ProxyServer
 import tutils
 from libpathod import test
 from netlib import http, tcp
@@ -58,7 +60,7 @@ class TestProcessProxyOptions:
         cmdline.common_options(parser)
         opts = parser.parse_args(args=args)
         m = MockParser()
-        return m, proxy.process_proxy_options(m, opts)
+        return m, process_proxy_options(m, opts)
 
     def assert_err(self, err, *args):
         m, p = self.p(*args)
@@ -117,12 +119,12 @@ class TestProxyServer:
         parser = argparse.ArgumentParser()
         cmdline.common_options(parser)
         opts = parser.parse_args(args=[])
-        tutils.raises("error starting proxy server", proxy.ProxyServer, opts, 1)
+        tutils.raises("error starting proxy server", ProxyServer, opts, 1)
 
 
 class TestDummyServer:
     def test_simple(self):
-        d = proxy.DummyServer(None)
+        d = DummyServer(None)
         d.start_slave()
         d.shutdown()
 
diff --git a/test/test_server.py b/test/test_server.py
index ed21e75c..43ef546d 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -3,8 +3,8 @@ import mock
 from netlib import tcp, http_auth, http
 from libpathod import pathoc, pathod
 import tutils, tservers
-from libmproxy import flow, proxy
 from libmproxy.protocol import KILL
+from libmproxy.protocol.http import CONTENT_MISSING
 
 """
     Note that the choice of response code in these tests matters more than you
@@ -381,7 +381,7 @@ class TestTransparentResolveError(tservers.TransparentProxTest):
 class MasterIncomplete(tservers.TestMaster):
     def handle_request(self, m):
         resp = tutils.tresp()
-        resp.content = flow.CONTENT_MISSING
+        resp.content = CONTENT_MISSING
         m.reply(resp)
 
 
diff --git a/test/tservers.py b/test/tservers.py
index cf9b3f73..bfafc8cd 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -2,8 +2,10 @@ import os.path
 import threading, Queue
 import shutil, tempfile
 import flask
+from libmproxy.proxy.config import ProxyConfig
+from libmproxy.proxy.server import ProxyServer
 import libpathod.test, libpathod.pathoc
-from libmproxy import proxy, flow, controller
+from libmproxy import flow, controller
 from libmproxy.cmdline import APP_HOST, APP_PORT
 import tutils
 
@@ -24,7 +26,7 @@ def errapp(environ, start_response):
 
 class TestMaster(flow.FlowMaster):
     def __init__(self, config):
-        s = proxy.ProxyServer(config, 0)
+        s = ProxyServer(config, 0)
         state = flow.State()
         flow.FlowMaster.__init__(self, s, state)
         self.apps.add(testapp, "testapp", 80)
@@ -84,7 +86,7 @@ class ProxTestBase(object):
         cls.server2 = libpathod.test.Daemon(ssl=cls.ssl, ssloptions=cls.ssloptions)
         pconf = cls.get_proxy_config()
         cls.confdir = os.path.join(tempfile.gettempdir(), "mitmproxy")
-        config = proxy.ProxyConfig(
+        config = ProxyConfig(
             no_upstream_cert = cls.no_upstream_cert,
             confdir = cls.confdir,
             authenticator = cls.authenticator,
@@ -256,7 +258,7 @@ class ChainProxTest(ProxTestBase):
     Chain n instances of mitmproxy in a row - because we can.
     """
     n = 2
-    chain_config = [lambda: proxy.ProxyConfig(
+    chain_config = [lambda: ProxyConfig(
     )] * n
     @classmethod
     def setupAll(cls):
diff --git a/test/tutils.py b/test/tutils.py
index 8690d67d..3f6592b0 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -1,8 +1,8 @@
 import os, shutil, tempfile
 from contextlib import contextmanager
-from libmproxy import flow, utils, controller, proxy
+from libmproxy import flow, utils, controller
 from libmproxy.protocol import http
-from libmproxy.prxy.connection import ClientConnection, ServerConnection
+from libmproxy.proxy.connection import ClientConnection, ServerConnection
 import mock_urwid
 from libmproxy.console.flowview import FlowView
 from libmproxy.console import ConsoleState