From 077272ec9703ff1b3f20f69c971adf63a6dd05c1 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 27 Jan 2011 10:52:42 +1300 Subject: Switch to BSON for data serialization. --- libmproxy/flow.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'libmproxy/flow.py') diff --git a/libmproxy/flow.py b/libmproxy/flow.py index c91dc14a..8eb7342a 100644 --- a/libmproxy/flow.py +++ b/libmproxy/flow.py @@ -2,7 +2,7 @@ This module provides more sophisticated flow tracking. These match requests with their responses, and provide filtering and interception facilities. """ -import json +from contrib import bson import proxy, threading class ReplayConnection: @@ -148,12 +148,14 @@ class State: return f def dump_flows(self): - data = [i.get_state() for i in self.view] - return json.dumps(data) + data = dict( + flows =[i.get_state() for i in self.view] + ) + return bson.dumps(data) def load_flows(self, js, klass): - data = json.loads(js) - data = [klass.from_state(i) for i in data] + data = bson.loads(js) + data = [klass.from_state(i) for i in data["flows"]] self.flow_list.extend(data) def set_limit(self, limit): -- cgit v1.2.3