Changeset e83f2f2 for fedd/federation/remote_service.py

Timestamp:

Dec 14, 2010 6:58:28 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

c092b7f

Parents:

2627eb3

Message:

Move proofs around. Lots of changes, including fault handling.

File:

• fedd/federation/remote_service.py (modified) (4 diffs)

fedd/federation/remote_service.py

@@ -16 +16 @@
 import httplib
 
+from proof import proof
 from service_error import service_error
 from xmlrpclib import ServerProxy, dumps, loads, Fault, Error, Binary
@@ -66 +67 @@
     # A map used to encapsulate fedids into xmlrpclib.Binary objects
     encap_fedids = (('fedid', to_binary),)
+
+    # fields that are never unicoded, because they represent non strings.
+    do_not_unicode = set(['credential'])
 
     @staticmethod
@@ -172 +176 @@
         if isinstance(obj, dict):
             for k in obj.keys():
-                obj[k] = remote_service_base.make_unicode(obj[k])
+                if k not in remote_service_base.do_not_unicode:
+                    obj[k] = remote_service_base.make_unicode(obj[k])
             return obj
         elif isinstance(obj, basestring) and not isinstance(obj, unicode):
@@ -513 +518 @@
                             'desc': e.fault.string or "Something Weird" }
                 if ee:
+                    if 'proof' in ee: 
+                        pl = [ proof.from_dict(p) for p in ee['proof']]
+                    else: 
+                        pl = None
                     raise service_error(ee.get('code', 'no code'), 
-                            ee.get('desc','no desc'))
+                            ee.get('desc','no desc'), proof=pl)
                 else:
                     raise service_error(service_error.internal,