From fc4fe83eafc68ebb9763fa5cbee1ed7e16964c9c Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 9 Mar 2014 21:13:08 +0100 Subject: split up proxy.py --- test/tutils.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'test/tutils.py') diff --git a/test/tutils.py b/test/tutils.py index b1bfc831..8690d67d 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -2,6 +2,7 @@ import os, shutil, tempfile from contextlib import contextmanager from libmproxy import flow, utils, controller, proxy from libmproxy.protocol import http +from libmproxy.prxy.connection import ClientConnection, ServerConnection import mock_urwid from libmproxy.console.flowview import FlowView from libmproxy.console import ConsoleState @@ -21,7 +22,7 @@ def SkipWindows(fn): def tclient_conn(): - c = proxy.ClientConnection._from_state(dict( + c = ClientConnection._from_state(dict( address=dict(address=("address", 22), use_ipv6=True), clientcert=None )) @@ -30,7 +31,7 @@ def tclient_conn(): def tserver_conn(): - c = proxy.ServerConnection._from_state(dict( + c = ServerConnection._from_state(dict( address=dict(address=("address", 22), use_ipv6=True), source_address=dict(address=("address", 22), use_ipv6=True), cert=None @@ -69,7 +70,7 @@ def tresp(req=None, content="message"): headers = flow.ODictCaseless() headers["header_response"] = ["svalue"] cert = certutils.SSLCert.from_der(file(test_data.path("data/dercert"), "rb").read()) - f.server_conn = proxy.ServerConnection._from_state(dict( + f.server_conn = ServerConnection._from_state(dict( address=dict(address=("address", 22), use_ipv6=True), source_address=None, cert=cert.to_pem())) -- cgit v1.2.3 From 5598a8de82f28232fb4407911a8643dceacc9ebc Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Sun, 9 Mar 2014 21:51:24 +0100 Subject: finish proxy.py split up --- test/tutils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/tutils.py') 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 -- cgit v1.2.3