Changeset 0a49bd7 for fedd/federation/server.py

Timestamp:

Jan 15, 2011 5:52:15 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

aaf7f41

Parents:

ac15159 (diff), 944b746 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Ted Faber <faber@…> (01/15/11 17:51:40)

git-committer:

Ted Faber <faber@…> (01/15/11 17:52:15)

Message:

merge from current

File:

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

fedd/federation/server.py

@@ -13 +13 @@
 
 from fedid import fedid
-from fedd_services import ns0
+
+# ZSI uses a deprecated multifile interface.  This shuts the warning system up.
+from warnings import filterwarnings
+filterwarnings("ignore", ".*multifile.*", DeprecationWarning, "ZSI")
+
+try:
+    from fedd_services import ns0
+except ImportError:
+    from fedd_server import ns0
+
 from service_error import *
 
@@ -127 +136 @@
             self.send_fault(f)
             resp = None
-        
+
         if resp != None:
             sw = SoapWriter()
@@ -192 +201 @@
                 de._errstr=e.code_string()
                 de._desc=e.desc
+                for p in e.proof:
+                    dp = ns0.proofType_Def(ns0.proofType_Def.schema, 
+                            "proof").pyclass()
+                    dp._prover = p.prover
+                    dp._principal = p.principal
+                    dp._attribute = p.attribute
+                    dp._credential = p.creds_to_certs()
+                    if de._proof: de._proof.append(dp)
+                    else: de._proof = [dp]
                 if  e.is_server_error():
                     raise Fault(Fault.Server, e.code_string(), detail=de)