Renamed internal "json" module to "streamingjson" to avoid conflicts with the standard python module

Fixes #18

Author: cmaglie

bridge/mailbox.py

@@ -27,7 +27,7 @@
 
 from tcp import TCPJSONServer
 from collections import deque
-import json
+import streamingjson
 
 json_server = TCPJSONServer('127.0.0.1', 5700)
 
@@ -115,7 +115,7 @@ def run(self, data):
 class SEND_JSON_Command:
   def run(self, data):
     try:
-      obj, i = json.read(data)
+      obj, i = streamingjson.read(data)
       mailbox.send(obj)
     except:
       mailbox.send(data)

bridge/json.py renamed to bridge/streamingjson.py

@@ -5,6 +5,9 @@
 ##    Copyright (C) 2005  Patrick D. Logan
 ##    Contact mailto:[email protected]
 ##
+##    streamingjson.py adds support for streaming.
+##    Copyright (C) 2014  Arduino
+##
 ##    This library is free software; you can redistribute it and/or
 ##    modify it under the terms of the GNU Lesser General Public
 ##    License as published by the Free Software Foundation; either
@@ -38,7 +41,7 @@ def next(self):
 			raise StopIteration
 	def all(self):
 		return self.string
-	
+
 	def pos(self):
 		return self.index
 
@@ -65,7 +68,7 @@ def _read(self):
         if peek == '{':
             return self._readObject()
         elif peek == '[':
-            return self._readArray()            
+            return self._readArray()
         elif peek == '"':
             return self._readString()
         elif peek == '-' or peek.isdigit():
@@ -248,7 +251,7 @@ def _next(self):
         return self._generator.next()
 
 class JsonWriter(object):
-        
+
     def _append(self, s):
         self._results.append(s)
 

bridge/tcp.py

@@ -28,7 +28,7 @@
 from socket import socket, AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR, gethostname
 from select import select
 from collections import deque
-import json
+import streamingjson
 import utils
 
 
@@ -57,7 +57,7 @@ def close(self):
 
 class TCPJSONSender(TCPClient):
   def send(self, obj):
-    data = json.write(obj)
+    data = streamingjson.write(obj)
     TCPClient.send(self, data)
 
 class TCPJSONClient(TCPJSONSender):
@@ -70,7 +70,7 @@ def recv(self):
     # try to stream-decode received data
     try:
       if len(self.recvbuff) > 0:
-        res, i = json.read(self.recvbuff)
+        res, i = streamingjson.read(self.recvbuff)
         self.recvbuff = self.recvbuff[i:].lstrip()
         return res
     except:
@@ -162,7 +162,7 @@ def recv(self, data):
     # try to stream-decode received data
     try:
       while len(data) > 0:
-        res, i = json.read(data)
+        res, i = streamingjson.read(data)
         self.recv_queue.append(res)
         data = data[i:].lstrip()
     except:
@@ -180,7 +180,7 @@ def read(self):
       return None
 
   def write(self, obj):
-    data = json.write(obj)
+    data = streamingjson.write(obj)
     self.send(data)
 
 # Test