From d998790c2f12594e6d0edc5a98e908677b60b31f Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 17 Sep 2014 11:35:14 +1200 Subject: Clean up and clarify StateObject - Flatten the class hierarchy - get_state, load_state, from_state are public - Simplify code - Remove __eq__ and __neq__. This fundamentally changes the semantics of inherited objects in a way that's not part of the core function of the class --- 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 69f79a91..e7720d33 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -55,7 +55,7 @@ def tclient_conn(): """ @return: libmproxy.proxy.connection.ClientConnection """ - c = ClientConnection._from_state(dict( + c = ClientConnection.from_state(dict( address=dict(address=("address", 22), use_ipv6=True), clientcert=None )) @@ -67,7 +67,7 @@ def tserver_conn(): """ @return: libmproxy.proxy.connection.ServerConnection """ - c = ServerConnection._from_state(dict( + c = ServerConnection.from_state(dict( address=dict(address=("address", 22), use_ipv6=True), state=[], source_address=dict(address=("address", 22), use_ipv6=True), -- cgit v1.2.3