Changeset 85bba36

Timestamp:

May 18, 2010 8:53:55 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

d743d60

Parents:

139e2e2

Message:

Another error case - unsupported methods - handled better.

File:

• fedd/federation/remote_service.py (modified) (1 diff)

fedd/federation/remote_service.py

@@ -490 +490 @@
                         "Bad format message (XMLRPC??): %s" % e)
             except FaultException, e:
-                ee = self.unpack_soap(e.fault.detail[0]).get('FeddFaultBody',
-                        { })
+                # If the method isn't implemented we get a FaultException
+                # without a detail (which would be a FeddFault).  If that's the
+                # case construct a service_error out of the SOAP fields of the
+                # fault, if they're present.
+                if e.fault.detail:
+                    det = e.fault.detail[0]
+                    ee = self.unpack_soap(det).get('FeddFaultBody', { })
+                else:
+                    ee = { 'code': service_error.internal, 
+                            'desc': e.fault.string or "Something Weird" }
                 if ee:
                     raise service_error(ee['code'], ee['desc'])