Changeset e15435c for fedd/federation/remote_service.py

Timestamp:

Jun 30, 2011 11:51:18 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

b3c4896

Parents:

9b76f1a

Message:

Correct application of multipl maps

File:

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

fedd/federation/remote_service.py

@@ -31 +31 @@
     service_port_name = 'getfeddPort'
     internal_service_port_name = 'getfedd_internal_port'
-
 from util import fedd_ssl_context
 from fedid import fedid
@@ -61 +60 @@
     # A map used to convert fedid fields to fedid objects (when the field is
     # already a string)
-    fedid_to_object = ( ('fedid', lambda x: fedid(bits=x)),)
+    fedid_to_object = {'fedid': lambda x: fedid(bits=x)}
     # A map used by apply_to_tags to convert fedids from xmlrpclib.Binary
     # objects to fedid objects in one sweep.
-    decap_fedids = (('fedid', lambda x: fedid(bits=x.data)),)
+    decap_fedids = {'fedid': lambda x: fedid(bits=x.data), 
+            'credential': lambda x: x.data}
     # A map used to encapsulate fedids into xmlrpclib.Binary objects
-    encap_fedids = (('fedid', to_binary),)
+    encap_fedids = {'fedid': to_binary, 'credential': to_binary}
 
     # fields that are never unicoded, because they represent non strings.
@@ -142 +142 @@
         if isinstance(e, dict):
             for k in e.keys():
-                for tag, fcn in map:
-                    if k == tag:
-                        if isinstance(e[k], list):
-                            e[k] = [ fcn(b) for b in e[k]]
-                        else:
-                            e[k] = fcn(e[k])
-                    elif isinstance(e[k], dict):
-                        remote_service_base.apply_to_tags(e[k], map)
-                    elif isinstance(e[k], list):
-                        for ee in e[k]:
-                            remote_service_base.apply_to_tags(ee, map)
+                if k in map:
+                    fcn = map[k]
+                    if isinstance(e[k], list):
+                        e[k] = [ fcn(b) for b in e[k]]
+                    else:
+                        e[k] = fcn(e[k])
+                elif isinstance(e[k], dict):
+                    remote_service_base.apply_to_tags(e[k], map)
+                elif isinstance(e[k], list):
+                    for ee in e[k]:
+                        remote_service_base.apply_to_tags(ee, map)
         # Other types end the recursion - they should be leaves
         return e