Fixed dictionary merging.

components/cloud_devices/tools/prototype/prototype.py

Index: components/cloud_devices/tools/prototype/prototype.py
diff --git a/components/cloud_devices/tools/prototype/prototype.py b/components/cloud_devices/tools/prototype/prototype.py
index cb4c49cfa08933549807fc16f81c5daac59c704a..2a0b9cdac7e5ef20048674277943418eb811fa27 100755
--- a/components/cloud_devices/tools/prototype/prototype.py
+++ b/components/cloud_devices/tools/prototype/prototype.py
@@ -12,6 +12,7 @@
     sudo apt-get install python-tornado
     sudo apt-get install python-pip
     sudo pip install google-api-python-client
+    sudo pip install ecdsa

[Noam Samuel, 2014/05/23 17:04:35]

Maybe wait to add this line until we use it?

 """
 
 import atexit
@@ -743,7 +744,10 @@ class WebRequestHandler(WifiHandler.Delegate, CloudDevice.Delegate):
   @post_provisioning
   @get_only
   def do_info(self, request, unused_response_func):
-    specific_info = {'x-privet-token': 'sample'}
+    specific_info = {
+        'x-privet-token': 'sample',
+        'api': sorted(self.handlers.keys())
+    }
     info = dict(self.get_common_info().items() + specific_info.items())
     self.real_send_response(request, 200, info)
     return True