Changeset 24679

Timestamp:

09/05/2008 05:18:26 AM (10 months ago)

Author:

therve

Message:

Merge xmlrpc-empty-response-3399 Author: therve Reviewer: exarkun Fixes #3399 Fix xmlrpc client so that he manages to return an error for buggy servers sending an empty response.

Files:

• trunk/twisted/web/test/test_xmlrpc.py (modified) (1 diff)
• trunk/twisted/web/xmlrpc.py (modified) (3 diffs)

trunk/twisted/web/test/test_xmlrpc.py

@@ -451 +451 @@
         self.queryFactory.badStatus('status', 'message')
         return d
+
+    def test_parseResponseWithoutData(self):
+        """
+        Some server can send a response without any data:
+        L{_QueryFactory.parseResponse} should catch the error and call the
+        result errback.
+        """
+        content = """
+<methodResponse>
+ <params>
+  <param>
+  </param>
+ </params>
+</methodResponse>"""
+        d = self.queryFactory.deferred
+        self.queryFactory.parseResponse(content)
+        return self.assertFailure(d, IndexError)

trunk/twisted/web/xmlrpc.py

@@ -305 +305 @@
             return
         try:
-            response = xmlrpclib.loads(contents)
+            response = xmlrpclib.loads(contents)[0][0]
         except:
             deferred, self.deferred = self.deferred, None
@@ -311 +311 @@
         else:
             deferred, self.deferred = self.deferred, None
-            deferred.callback(response[0][0])
+            deferred.callback(response)
 
     def clientConnectionLost(self, _, reason):
@@ -392 +392 @@
 
     def callRemote(self, method, *args):
+        """
+        Call remote XML-RPC C{method} with given arguments.
+
+        @return: a L{defer.Deferred} that will fire with the method response,
+            or a failure if the method failed. Generally, the failure type will
+            be L{Fault}, but you can also have an C{IndexError} on some buggy
+            servers giving empty responses.
+        """
         factory = self.queryFactory(
             self.path, self.host, method, self.user,