From 33dac700fa5bc1779699d3d8f751e2e337f6f31a Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Wed, 16 Feb 2011 15:10:00 +1300
Subject: Switch over to new serialization format.

Remove BSON from contrib.
---
 libmproxy/contrib/bson/network.py | 64 ---------------------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 libmproxy/contrib/bson/network.py

(limited to 'libmproxy/contrib/bson/network.py')

diff --git a/libmproxy/contrib/bson/network.py b/libmproxy/contrib/bson/network.py
deleted file mode 100644
index f9a90d48..00000000
--- a/libmproxy/contrib/bson/network.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env python
-
-import socket
-try:
-	from cStringIO import StringIO
-except ImportError, e:
-	from StringIO import StringIO
-from struct import unpack
-from __init__ import dumps, loads
-
-def _bintoint(data):
-	return unpack("<i", data)[0]
-
-def _sendobj(self, obj):
-	"""
-	Atomically send a BSON message.
-	"""
-	data = dumps(obj)
-	self.sendall(data)
-
-def _recvobj(self):
-	"""
-	Atomic read of a BSON message.
-
-	This function either returns a dict, None, or raises a socket error.
-
-	If the return value is None, it means the socket is closed by the other side.
-	"""
-	sock_buf = self.recvbytes(4)
-	if sock_buf is None:
-		return None
-
-	message_length = _bintoint(sock_buf.getvalue())
-	sock_buf = self.recvbytes(message_length - 4, sock_buf)
-	if sock_buf is None:
-		return None
-
-	retval = loads(sock_buf.getvalue())
-	return retval
-
-
-def _recvbytes(self, bytes_needed, sock_buf = None):
-	"""
-	Atomic read of bytes_needed bytes.
-
-	This function either returns exactly the nmber of bytes requested in a
-	StringIO buffer, None, or raises a socket error.
-
-	If the return value is None, it means the socket is closed by the other side.
-	"""
-	if sock_buf is None:
-		sock_buf = StringIO()
-	bytes_count = 0
-	while bytes_count < bytes_needed:
-		chunk = self.recv(min(bytes_needed - bytes_count, 32768))
-		part_count = len(chunk)
-
-		if part_count < 1:
-			return None
-
-		bytes_count += part_count
-		sock_buf.write(chunk)
-	
-	return sock_buf
-- 
cgit v1.2.3