commit 5deff438c70df0c046b93b50088b361e22bfbcbb
author showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Thu May 08 01:10:26 2008 +0000
committer showard <showard@592f7852-d20e-0410-864c-8624ca9c26a4> Thu May 08 01:10:26 2008 +0000
tree 9f4aaf1878377988f43e859d59a9b0c8451c8f7a
parent ec1131602644131b7383565477b97bdf81c1b8e5

When a non-JSON response is received, instead just raising a useless exception, include the entire response.



git-svn-id: http://test.kernel.org/svn/autotest/trunk@1496 592f7852-d20e-0410-864c-8624ca9c26a4

frontend/afe/json_rpc/proxy.py

diff --git a/frontend/afe/json_rpc/proxy.py b/frontend/afe/json_rpc/proxy.py
index 8412ed6..d33fc96 100644
--- a/frontend/afe/json_rpc/proxy.py
+++ b/frontend/afe/json_rpc/proxy.py
@@ -45,7 +45,10 @@
          request = urllib2.Request(self.__serviceURL, data=postdata,
                                    headers=self.__headers)
          respdata = urllib2.urlopen(request).read()
-         resp = json_decoder.decode(respdata)
+         try:
+             resp = json_decoder.decode(respdata)
+         except ValueError:
+             raise JSONRPCException('Error decoding JSON reponse:\n' + respdata)
          if resp['error'] != None:
              error_message = (resp['error']['name'] + ': ' +
                               resp['error']['message'] + '\n' +