avoid as much as possible accessing logger through class instances, whenever that...

[sfa.git] / sfa / trust / sfaticket.py

diff --git a/sfa/trust/sfaticket.py b/sfa/trust/sfaticket.py
index 78e6d87..2c1e38b 100644 (file)
--- a/sfa/trust/sfaticket.py
+++ b/sfa/trust/sfaticket.py
@@ -26,11 +26,11 @@
 
 from __future__ import print_function
 
-import xmlrpclib
-
 from sfa.trust.certificate import Certificate
 from sfa.trust.gid import GID
 
+from sfa.util.py23 import xmlrpc_client
+
 # Ticket is tuple:
 #   (gidCaller, gidObject, attributes, rspec, delegate)
 #
@@ -39,6 +39,7 @@ from sfa.trust.gid import GID
 #    attributes = slice attributes (keys, vref, instantiation, etc)
 #    rspec = resources
 
+
 class SfaTicket(Certificate):
     gidCaller = None
     gidObject = None
@@ -96,16 +97,18 @@ class SfaTicket(Certificate):
                 "rspec": self.rspec,
                 "delegate": self.delegate}
         if self.gidCaller:
-            dict["gidCaller"] = self.gidCaller.save_to_string(save_parents=True)
+            dict["gidCaller"] = self.gidCaller.save_to_string(
+                save_parents=True)
         if self.gidObject:
-            dict["gidObject"] = self.gidObject.save_to_string(save_parents=True)
-        str = "URI:" + xmlrpclib.dumps((dict,), allow_none=True)
+            dict["gidObject"] = self.gidObject.save_to_string(
+                save_parents=True)
+        str = "URI:" + xmlrpc_client.dumps((dict,), allow_none=True)
         self.set_data(str)
 
     def decode(self):
         data = self.get_data()
         if data:
-            dict = xmlrpclib.loads(self.get_data()[4:])[0][0]
+            dict = xmlrpc_client.loads(self.get_data()[4:])[0][0]
         else:
             dict = {}
 
@@ -146,5 +149,5 @@ class SfaTicket(Certificate):
         print("        ", self.get_rspec())
 
         if self.parent and dump_parents:
-           print("PARENT", end=' ')
-           self.parent.dump(dump_parents)
+            print("PARENT", end=' ')
+            self.parent.dump(dump_parents)